Merge tizen_2.3 branch 07/22307/1
authorLi Zhang <li2012.zhang@samsung.com>
Sat, 31 May 2014 09:44:34 +0000 (17:44 +0800)
committerLi Zhang <li2012.zhang@samsung.com>
Sat, 31 May 2014 09:47:46 +0000 (17:47 +0800)
Change-Id: I0e30048d9eb3497ec3038cdeb1472715b0bb5200
Signed-off-by: Li Zhang <li2012.zhang@samsung.com>
239 files changed:
Makefile.am
bootstrap
configure.ac
ism/configs/config
ism/data/icons/01_header_icon_cancel.png [deleted file]
ism/data/icons/01_header_icon_done.png [deleted file]
ism/data/icons/Makefile.am
ism/data/icons/pop_play.png [new file with mode: 0755]
ism/data/pixmaps/B09_predictive_bg.png
ism/data/pixmaps/B09_predictive_icon_arrow_down.png
ism/data/pixmaps/B09_predictive_icon_arrow_up.png
ism/data/pixmaps/B09_predictive_on_bg.png
ism/data/pixmaps/B09_predictive_vertical_line.png
ism/data/pixmaps/Makefile.am
ism/data/pixmaps/edc_image_macro.edc [new file with mode: 0644]
ism/data/pixmaps/isf_candidate.edc
ism/data/pixmaps/isf_candidate_theme1.edc
ism/data/pixmaps/isf_minicontrol.edc [new file with mode: 0644]
ism/data/pixmaps/isfsetting.edc [deleted file]
ism/data/pixmaps/keyboardicon.png [new file with mode: 0755]
ism/data/pixmaps/noti_icon_keyboard_connected.png [new file with mode: 0755]
ism/demos/Makefile.am
ism/demos/include/isf_demo_efl.h
ism/demos/include/isf_ondemand_efl.h [moved from ism/extras/efl_setting/include/isf_setting_efl.h with 52% similarity]
ism/demos/isf_demo_efl.cpp
ism/demos/isf_ondemand_efl.cpp [new file with mode: 0644]
ism/extras/Makefile.am
ism/extras/efl_immodule/Makefile.am
ism/extras/efl_immodule/isf_imf_context.cpp
ism/extras/efl_immodule/isf_imf_context.h
ism/extras/efl_immodule/isf_imf_control_ui.cpp
ism/extras/efl_immodule/isf_imf_control_ui.h
ism/extras/efl_immodule/isf_imf_module.cpp
ism/extras/efl_panel/Makefile.am
ism/extras/efl_panel/center_popup.cpp [new file with mode: 0644]
ism/extras/efl_panel/center_popup.h [new file with mode: 0644]
ism/extras/efl_panel/isf_panel_efl.cpp
ism/extras/efl_panel/isf_panel_utility.cpp
ism/extras/efl_panel/isf_panel_utility.h
ism/extras/efl_panel/minicontrol.cpp [new file with mode: 0644]
ism/extras/efl_panel/minicontrol.h [new file with mode: 0644]
ism/extras/efl_setting/Makefile.am [deleted file]
ism/extras/efl_setting/isf_setting_efl.cpp [deleted file]
ism/m4/ChangeLog [deleted file]
ism/m4/Makefile.am [deleted file]
ism/m4/codeset.m4 [deleted file]
ism/m4/gettext.m4 [deleted file]
ism/m4/glibc21.m4 [deleted file]
ism/m4/iconv.m4 [deleted file]
ism/m4/intdiv0.m4 [deleted file]
ism/m4/intltool.m4 [deleted file]
ism/m4/intmax.m4 [deleted file]
ism/m4/inttypes-pri.m4 [deleted file]
ism/m4/inttypes.m4 [deleted file]
ism/m4/inttypes_h.m4 [deleted file]
ism/m4/isc-posix.m4 [deleted file]
ism/m4/lcmessage.m4 [deleted file]
ism/m4/lib-ld.m4 [deleted file]
ism/m4/lib-link.m4 [deleted file]
ism/m4/lib-prefix.m4 [deleted file]
ism/m4/longdouble.m4 [deleted file]
ism/m4/longlong.m4 [deleted file]
ism/m4/nls.m4 [deleted file]
ism/m4/po.m4 [deleted file]
ism/m4/printf-posix.m4 [deleted file]
ism/m4/progtest.m4 [deleted file]
ism/m4/signed.m4 [deleted file]
ism/m4/size_max.m4 [deleted file]
ism/m4/stdint_h.m4 [deleted file]
ism/m4/uintmax_t.m4 [deleted file]
ism/m4/ulonglong.m4 [deleted file]
ism/m4/wchar_t.m4 [deleted file]
ism/m4/wint_t.m4 [deleted file]
ism/m4/xsize.m4 [deleted file]
ism/modules/config/scim_socket_config.cpp
ism/modules/frontend/imdkit/i18nMethod.c
ism/modules/frontend/scim_socket_frontend.cpp
ism/modules/frontend/scim_socket_frontend.h
ism/modules/frontend/scim_x11_frontend.cpp
ism/modules/frontend/scim_x11_frontend.h
ism/modules/imengine/scim_socket_imengine.cpp
ism/src/Makefile.am
ism/src/ise_preexec.cpp
ism/src/ise_preexec.h
ism/src/isf_control.cpp
ism/src/isf_control.h
ism/src/isf_imcontrol_client.cpp
ism/src/isf_imcontrol_client.h
ism/src/isf_query_engines.cpp
ism/src/isf_query_utility.cpp
ism/src/scim.cpp
ism/src/scim_backend.cpp
ism/src/scim_config_path.h
ism/src/scim_filter.cpp
ism/src/scim_filter.h
ism/src/scim_frontend.cpp
ism/src/scim_frontend.h
ism/src/scim_helper.cpp
ism/src/scim_helper.h
ism/src/scim_helper_launcher.cpp
ism/src/scim_helper_manager.cpp
ism/src/scim_imengine.cpp
ism/src/scim_imengine.h
ism/src/scim_imengine_module.h
ism/src/scim_keyevent_data.h
ism/src/scim_launcher.cpp
ism/src/scim_panel_agent.cpp
ism/src/scim_panel_agent.h
ism/src/scim_panel_client.cpp
ism/src/scim_panel_client.h
ism/src/scim_setup_module_efl.cpp [moved from ism/extras/efl_setting/scim_setup_module_efl.cpp with 100% similarity]
ism/src/scim_setup_module_efl.h [moved from ism/extras/efl_setting/include/scim_setup_module_efl.h with 96% similarity]
ism/src/scim_socket.cpp
ism/src/scim_trans_commands.h
ism/src/scim_transaction.cpp [changed mode: 0644->0755]
ism/src/scim_transaction.h
ism/src/scim_utility.cpp
ism/src/scim_utility.h
packaging/isf.spec
packaging/scim.service [new file with mode: 0644]
po/isfsetting_efl/Makefile.in.in [deleted file]
po/isfsetting_efl/POTFILES.in [deleted file]
po/isfsetting_efl/ar.po [deleted file]
po/isfsetting_efl/az.po [deleted file]
po/isfsetting_efl/bg.po [deleted file]
po/isfsetting_efl/ca.po [deleted file]
po/isfsetting_efl/cs.po [deleted file]
po/isfsetting_efl/da.po [deleted file]
po/isfsetting_efl/de_DE.po [deleted file]
po/isfsetting_efl/el_GR.po [deleted file]
po/isfsetting_efl/en.po [deleted file]
po/isfsetting_efl/en_PH.po [deleted file]
po/isfsetting_efl/en_US.po [deleted file]
po/isfsetting_efl/es_ES.po [deleted file]
po/isfsetting_efl/es_MX.po [deleted file]
po/isfsetting_efl/es_US.po [deleted file]
po/isfsetting_efl/et.po [deleted file]
po/isfsetting_efl/eu.po [deleted file]
po/isfsetting_efl/fa.po [deleted file]
po/isfsetting_efl/fi.po [deleted file]
po/isfsetting_efl/fr_CA.po [deleted file]
po/isfsetting_efl/fr_FR.po [deleted file]
po/isfsetting_efl/ga.po [deleted file]
po/isfsetting_efl/gl.po [deleted file]
po/isfsetting_efl/hi.po [deleted file]
po/isfsetting_efl/hr.po [deleted file]
po/isfsetting_efl/hu.po [deleted file]
po/isfsetting_efl/hy.po [deleted file]
po/isfsetting_efl/is.po [deleted file]
po/isfsetting_efl/isfsetting-efl.pot [deleted file]
po/isfsetting_efl/it_IT.po [deleted file]
po/isfsetting_efl/ja_JP.po [deleted file]
po/isfsetting_efl/ka.po [deleted file]
po/isfsetting_efl/kk.po [deleted file]
po/isfsetting_efl/ko_KR.po [deleted file]
po/isfsetting_efl/lt.po [deleted file]
po/isfsetting_efl/lv.po [deleted file]
po/isfsetting_efl/mk.po [deleted file]
po/isfsetting_efl/nb.po [deleted file]
po/isfsetting_efl/nl_NL.po [deleted file]
po/isfsetting_efl/pl.po [deleted file]
po/isfsetting_efl/pt_BR.po [deleted file]
po/isfsetting_efl/pt_PT.po [deleted file]
po/isfsetting_efl/ro.po [deleted file]
po/isfsetting_efl/ru_RU.po [deleted file]
po/isfsetting_efl/sk.po [deleted file]
po/isfsetting_efl/sl.po [deleted file]
po/isfsetting_efl/sr.po [deleted file]
po/isfsetting_efl/sv.po [deleted file]
po/isfsetting_efl/th.po [deleted file]
po/isfsetting_efl/tr_TR.po [deleted file]
po/isfsetting_efl/uk.po [deleted file]
po/isfsetting_efl/update-po.sh [deleted file]
po/isfsetting_efl/ur.po [deleted file]
po/isfsetting_efl/uz.po [deleted file]
po/isfsetting_efl/zh_CN.po [deleted file]
po/isfsetting_efl/zh_HK.po [deleted file]
po/isfsetting_efl/zh_SG.po [deleted file]
po/isfsetting_efl/zh_TW.po [deleted file]
po/scim/POTFILES.in
po/scim/ar.po
po/scim/az.po
po/scim/bg.po
po/scim/ca.po
po/scim/cs.po
po/scim/da.po
po/scim/de_DE.po
po/scim/el_GR.po
po/scim/en.po
po/scim/en_PH.po
po/scim/en_US.po
po/scim/es_ES.po
po/scim/es_MX.po
po/scim/es_US.po
po/scim/et.po
po/scim/eu.po
po/scim/fa.po
po/scim/fi.po
po/scim/fr_CA.po
po/scim/fr_FR.po
po/scim/ga.po
po/scim/gl.po
po/scim/hi.po
po/scim/hr.po
po/scim/hu.po
po/scim/hy.po
po/scim/is.po
po/scim/it_IT.po
po/scim/ja_JP.po
po/scim/ka.po
po/scim/kk.po
po/scim/ko_KR.po
po/scim/lt.po
po/scim/lv.po
po/scim/mk.po
po/scim/nb.po
po/scim/nl_NL.po
po/scim/pl.po
po/scim/pt_BR.po
po/scim/pt_PT.po
po/scim/ro.po
po/scim/ru_RU.po
po/scim/scim.pot
po/scim/sk.po
po/scim/sl.po
po/scim/sr.po
po/scim/sv.po
po/scim/th.po
po/scim/tr_TR.po
po/scim/uk.po
po/scim/ur.po
po/scim/uz.po
po/scim/zh_CN.po
po/scim/zh_HK.po
po/scim/zh_SG.po
po/scim/zh_TW.po
releasenote.txt
scim.service
ug-isfsetting-efl.xml [deleted file]

index 7cf46f1..f39e05a 100644 (file)
@@ -27,13 +27,13 @@ AUX_DIST                = $(ac_aux_dir)/config.guess \
 EXTRA_DIST             = config.rpath \
                          mkinstalldirs \
                          bootstrap \
-                         scim.spec \
+                         scim.spec \
                          intltool-extract.in \
                          intltool-merge.in \
                          intltool-update.in
 
 AUTOMAKE_OPTIONS       = gnu
-SUBDIRS                = ism/m4 ism/src ism/utils ism/modules ism/configs po/scim po/isfsetting_efl ism/extras ism/data ism/demos
+SUBDIRS                = ism/src ism/utils ism/modules ism/configs po/scim ism/extras ism/data ism/demos
 
 MAINTAINERCLEANFILES   = Makefile.in \
                          aclocal.m4 \
@@ -43,7 +43,7 @@ MAINTAINERCLEANFILES  = Makefile.in \
 
 DISTCLEANFILES         = isf.pc scim.pc scim-gtkutils.pc intltool-extract intltool-merge intltool-update
 
-CLEANFILES             = *.bak 
+CLEANFILES             = *.bak
 
 ACLOCAL                        = aclocal -I $(ac_aux_dir)/ism
 
@@ -56,12 +56,14 @@ endif
 pkgconfig_DATA          = isf.pc scim.pc \
                          $(GTK_UTILS_PKGCONFIG)
 
-ugxmldir = /usr/share/packages/
-ugxml_DATA = ug-isfsetting-efl.xml
 
 # $(libdir) will be /usr/lib64 on x86_64 arch, so hard-coded.
+
+if MOBILE_ENV
+else
 systemduserunitdir = /usr/lib/systemd/user
 systemduserunit_DATA = scim.service
+endif
 
 ACLOCAL_AMFLAGS = -I ism/m4
 
@@ -73,6 +75,9 @@ update-ChangeLog:
 uninstall-local:
        rm -rf @SCIM_MODULE_PATH@
 
+if MOBILE_ENV
+else
 install-data-hook:
        $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/core-efl.target.wants
        ln -sf ../scim.service $(DESTDIR)$(systemduserunitdir)/core-efl.target.wants/scim.service
+endif
index bbc1b36..1e4109a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -20,6 +20,7 @@
 #! /bin/sh
 
 set -x
+libtoolize --force
 aclocal -I ism/m4
 autoheader
 libtoolize -c --automake 
index 7402152..7c411fd 100755 (executable)
@@ -1,8 +1,7 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.4.7104, isf@samsung.com)
+AC_INIT(isf, 2.4.7424, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
-m4_pattern_allow([^AS_])
 
 ###########################################################
 ##          Some definitions of Version macros.          ##
@@ -11,7 +10,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=4
-ISF_MICRO_VERSION=7104
+ISF_MICRO_VERSION=7424
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 
@@ -124,7 +123,7 @@ AC_PATH_PROG(PERL, perl)
 AC_SUBST(PERL)
 
 # Check intltool
-IT_PROG_INTLTOOL([0.33], [no-xml])
+#IT_PROG_INTLTOOL([0.33], [no-xml])
 
 # Checks for libraries.
 AC_HEADER_STDC
@@ -216,7 +215,7 @@ if test "$ISF_HAS_GCONF" = "yes"; then
 fi
 
 # Check EFL library
-PKG_CHECK_MODULES(EFL, [elementary ecore-x evas ecore ecore-evas ecore-file edje ecore-input ecore-imf],
+PKG_CHECK_MODULES(EFL, [elementary ecore-x evas ecore ecore-evas ecore-file edje ecore-input ecore-ipc ecore-imf],
                   [ISF_HAS_EFL=yes],
                   [ISF_HAS_EFL=no])
 
@@ -237,10 +236,9 @@ PKG_CHECK_MODULES(EFL_ASSIST, [efl-assist])
 PKG_CHECK_MODULES(X11, [x11])
 
 # Check ui-gadget library
-PKG_CHECK_MODULES(UIGADGET, [ui-gadget-1])
-
-# Check pkgmgr-info library
-PKG_CHECK_MODULES(PKGMGR_INFO, [pkgmgr-info])
+PKG_CHECK_MODULES(UIGADGET, [ui-gadget-1],
+                  [ISF_HAS_UIGADGET=yes],
+                  [ISF_HAS_UIGADGET=no])
 
 # Check utilX library
 PKG_CHECK_MODULES(UTILX, [utilX])
@@ -254,6 +252,11 @@ PKG_CHECK_MODULES(DLOG, [dlog >= 0])
 # Check privilege control library
 PKG_CHECK_MODULES(PRIVILEGE_CONTROL, [libprivilege-control >= 0])
 
+# Check minicontrol library
+PKG_CHECK_MODULES(MINICONTROL_PROVIDER, [minicontrol-provider],
+                  [ISF_HAS_MINICONTROL=yes],
+                  [ISF_HAS_MINICONTROL=no])
+
 # Check ail library
 PKG_CHECK_MODULES(AIL, [ail >= 0])
 
@@ -269,11 +272,22 @@ if test "$ISF_HAS_TTS" = "yes"; then
   AC_DEFINE(HAVE_TTS,1,[Have TTS functions.])
 fi
 
+# Check security server
+PKG_CHECK_MODULES(SECURITY_SERVER, [security-server])
+
 # Check vconf library
 PKG_CHECK_MODULES(VCONF, [vconf],
                   [ISF_HAS_VCONF=yes],
                   [ISF_HAS_VCONF=no])
 
+# Check edbus library
+PKG_CHECK_MODULES(EDBUS, [edbus])
+
+# Check bluetooth library
+PKG_CHECK_MODULES(BLUETOOTH, [capi-network-bluetooth],
+                  [ISF_HAS_BLUETOOTH=yes],
+                  [ISF_HAS_BLUETOOTH=no])
+
 # Check feedback library
 PKG_CHECK_MODULES(FEEDBACK, [feedback],
                   [ISF_HAS_FEEDBACK=yes],
@@ -283,10 +297,24 @@ if test "$ISF_HAS_VCONF" = "yes"; then
   AC_DEFINE(HAVE_VCONF,1,[Have VConf functions.])
 fi
 
+if test "$ISF_HAS_BLUETOOTH" = "yes"; then
+  AC_DEFINE(HAVE_BLUETOOTH,1,[Have Bluetooth functions.])
+fi
+
 if test "$ISF_HAS_FEEDBACK" = "yes"; then
   AC_DEFINE(HAVE_FEEDBACK,1,[Have Feedback functions.])
 fi
 
+if test "$ISF_HAS_MINICONTROL" = "yes"; then
+  AC_DEFINE(HAVE_MINICONTROL,1,[Have Minicontrol functions.])
+fi
+
+if test "$ISF_HAS_UIGADGET" = "yes"; then
+  AC_DEFINE(HAVE_UIGADGET,1,[Have UI gadget functions.])
+fi
+
+AM_CONDITIONAL([MOBILE_ENV], [test x$ISF_HAS_UIGADGET = xyes])
+
 # Check GTK2 library
 PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
                   [SCIM_HAS_GTK2=yes],
@@ -607,6 +635,9 @@ AM_CONDITIONAL(ISF_BUILD_SETTING_EFL,
 AM_CONDITIONAL(ISF_BUILD_WITH_GCONF,
                 [test "$ISF_HAS_GCONF" = "yes"])
 
+AM_CONDITIONAL(ISF_BUILD_MINICONTROL,
+                [test "$ISF_HAS_MINICONTROL" = "yes"])
+
 AC_SUBST(SCIM_BUILD_TESTS)
 AC_SUBST(SCIM_BUILD_CONFIG_SIMPLE)
 AC_SUBST(SCIM_BUILD_CONFIG_SOCKET)
@@ -652,9 +683,7 @@ AC_SUBST(SCIM_TEMPDIR)
 ###########################################################
 AC_SUBST(ac_aux_dir)
 AC_CONFIG_FILES([Makefile
-                 ism/m4/Makefile
                  po/scim/Makefile.in
-                 po/isfsetting_efl/Makefile.in
                  ism/src/Makefile
                  ism/src/scim_types.h
                  ism/utils/Makefile
@@ -672,7 +701,6 @@ AC_CONFIG_FILES([Makefile
                  ism/extras/gtk2_immodule/Makefile
                  ism/extras/efl_immodule/Makefile
                  ism/extras/efl_panel/Makefile
-                 ism/extras/efl_setting/Makefile
                  ism/demos/Makefile
                  intltool-extract
                  intltool-merge
@@ -693,7 +721,7 @@ Build options:
   Build for x86 host       $enable_x86
   Enable ld version script $enable_ld_version_script
 
-Module options:           
+Module options:
   Simple config module     $enable_config_simple
   Socket config module     $enable_config_socket
 
index fe04579..83d6883 100755 (executable)
@@ -25,5 +25,5 @@
 /Panel/Gtk/ShowTrayIcon = true
 /Panel/Gtk/ToolBar/AlwaysShow = false
 /Panel/Gtk/ToolBar/HideTimeout = 2
-/Panel/Gtk/ToolBar/POS_X = -1 
+/Panel/Gtk/ToolBar/POS_X = -1
 /Panel/Gtk/ToolBar/POS_Y = -1 
diff --git a/ism/data/icons/01_header_icon_cancel.png b/ism/data/icons/01_header_icon_cancel.png
deleted file mode 100644 (file)
index 4fb54c3..0000000
Binary files a/ism/data/icons/01_header_icon_cancel.png and /dev/null differ
diff --git a/ism/data/icons/01_header_icon_done.png b/ism/data/icons/01_header_icon_done.png
deleted file mode 100644 (file)
index d771640..0000000
Binary files a/ism/data/icons/01_header_icon_done.png and /dev/null differ
index 791918a..478a6ab 100644 (file)
@@ -17,7 +17,7 @@
 
 MAINTAINERCLEANFILES   = Makefile.in
 
-INST_ICONS             = keyboard.png
+INST_ICONS             = keyboard.png pop_play.png
 
 SCTC_FILTER_ICONS      = sctc.png \
                          sctc-sc-to-tc.png \
diff --git a/ism/data/icons/pop_play.png b/ism/data/icons/pop_play.png
new file mode 100755 (executable)
index 0000000..06328a6
Binary files /dev/null and b/ism/data/icons/pop_play.png differ
index 796ffc3..0301935 100755 (executable)
Binary files a/ism/data/pixmaps/B09_predictive_bg.png and b/ism/data/pixmaps/B09_predictive_bg.png differ
index 3d71005..c45721c 100755 (executable)
Binary files a/ism/data/pixmaps/B09_predictive_icon_arrow_down.png and b/ism/data/pixmaps/B09_predictive_icon_arrow_down.png differ
index b7cf9c1..ceb1a2d 100755 (executable)
Binary files a/ism/data/pixmaps/B09_predictive_icon_arrow_up.png and b/ism/data/pixmaps/B09_predictive_icon_arrow_up.png differ
index dc47970..a3b165b 100755 (executable)
Binary files a/ism/data/pixmaps/B09_predictive_on_bg.png and b/ism/data/pixmaps/B09_predictive_on_bg.png differ
index 73c6e03..19824e7 100755 (executable)
Binary files a/ism/data/pixmaps/B09_predictive_vertical_line.png and b/ism/data/pixmaps/B09_predictive_vertical_line.png differ
index 928f756..52fad8c 100644 (file)
@@ -23,8 +23,5 @@ CLEANFILES           = *.bak *.edj
 isf_candidate_theme1.edj : isf_candidate_theme1.edc
        edje_cc $^ $@
 
-isfsetting.edj : isfsetting.edc
-       edje_cc $^ $@
-
 edjdir   = @SCIM_DATADIR@
-edj_DATA = isf_candidate_theme1.edj isfsetting.edj
+edj_DATA = isf_candidate_theme1.edj
diff --git a/ism/data/pixmaps/edc_image_macro.edc b/ism/data/pixmaps/edc_image_macro.edc
new file mode 100644 (file)
index 0000000..daf298e
--- /dev/null
@@ -0,0 +1,31 @@
+#define RESOURCE_IMAGE( FILE_NAME ) \
+   group { \
+      name: FILE_NAME; \
+      images.image: FILE_NAME COMP; \
+      parts { \
+         part { name: "image"; \
+            description { \
+               state: "default" 0.0; \
+               image.normal: FILE_NAME; \
+               aspect: 1 1; \
+               aspect_preference: BOTH; \
+            } \
+         } \
+      } \
+   }
+
+#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \
+   group { \
+      name: FILE_NAME; \
+      images.image: FILE_NAME LOSSY 85; \
+      parts { \
+         part { name: "image"; \
+            description { \
+               state: "default" 0.0; \
+               image.normal: FILE_NAME; \
+               aspect: 1 1; \
+               aspect_preference: BOTH; \
+            } \
+         } \
+      } \
+   }
index fe9d5bd..2b539ca 100755 (executable)
@@ -1,12 +1,12 @@
 
-#define FONT_NAME               "Tizen"
+#define FONT_NAME               "Tizen:style=Regular"
 #define FONT_SIZE               38
 
-#define AUX_FONT_NAME           "Tizen"
+#define AUX_FONT_NAME           "Tizen:style=Regular"
 #define AUX_FONT_SIZE           38
 
 #define COLOR_NORMAL_BUTTON     0 0 0 0
-#define COLOR_PRESS_BUTTON      166 166 166 255
+#define COLOR_PRESS_BUTTON      166 166 166 200
 
 #define COLOR_SELECT_TEXT       62 207 255 255
 
@@ -119,11 +119,12 @@ collections {
                     color: COLOR_NORMAL_TEXT;
                     color_class: "text_color";
                     text {
-                        text_class: "preedit_text_class";
+                        text_class: "tizen";
                         text: "";
                         font: FONT_NAME;
                         size: FONT_SIZE;
                         align: 0 0.5;
+                        min: 1 0;
                     }
                     rel1.to: "bg";
                     rel1.relative: 0.0 0.0;
@@ -136,12 +137,7 @@ collections {
         }
     }
 
-    group { name: "candidate";
-        images {
-            image: BUTTON_NORMAL_BG COMP;
-            image: BUTTON_PRESS_BG COMP;
-        }
-
+    group { name: "candidate_object_table";
         parts {
             part { name: "bg";
                 type: RECT;
@@ -149,7 +145,7 @@ collections {
                 description { state: "default" 0.0;
                     rel1.relative: 0.0 0.0;
                     rel2.relative: 1.0 1.0;
-                    color_class: "rect_color";
+                    color: COLOR_NORMAL_BUTTON;
                 }
                 description { state: "pressed" 0.0;
                     rel1.relative: 0.0 0.0;
@@ -157,40 +153,12 @@ collections {
                     color: COLOR_PRESS_BUTTON;
                 }
             }
-
-            part { name: "candidate";
-                type: TEXT;
-                mouse_events: 0;
-                //effect: SHADOW;
-                description { state: "default" 0.0;
-                    color: COLOR_NORMAL_TEXT;
-                    color_class: "text_color";
-                    text {
-                        text_class: "candidate_text_class";
-                        text: "Test";
-                        font: FONT_NAME;
-                        size: FONT_SIZE;
-                        align: 0.5 0.5;
-                    }
-                    rel1.to: "bg";
-                    rel1.relative: 0.0 0.0;
-                    rel1.offset: 11 0;
-                    rel2.to: "bg";
-                    rel2.relative: 1.0 1.0;
-                    rel2.offset: -11 0;
-                }
-                description { state: "pressed" 0.0;
-                    inherit: "default" 0.0;
-                    color: COLOR_PRESS_TEXT;
-                }
-            }
         }
-
         programs {
             program { name: "button_click";
                 signal: "mouse,clicked,1";
                 source: "bg";
-                action: SIGNAL_EMIT "candidate,action,clicked" "";
+                action: SIGNAL_EMIT "candidate_box,action,clicked" "";
             }
 
             program { name, "button_press";
@@ -198,7 +166,6 @@ collections {
                 source, "bg";
                 action, STATE_SET "pressed" 0.0;
                 target, "bg";
-                target, "candidate";
             }
 
             program { name, "button_release";
@@ -206,14 +173,49 @@ collections {
                 source, "bg";
                 action, STATE_SET "default" 0.0;
                 target, "bg";
-                target, "candidate";
-                //after, "do_me";
+            }
+        }
+    }
+
+    group { name: "candidate";
+        images {
+            image: BUTTON_NORMAL_BG COMP;
+            image: BUTTON_PRESS_BG COMP;
+        }
+
+        parts {
+            part { name: "bg";
+                type: RECT;
+                mouse_events: 1;
+                description { state: "default" 0.0;
+                    rel1.relative: 0.0 0.0;
+                    rel2.relative: 1.0 1.0;
+                    color_class: "rect_color";
+                }
             }
 
-            program { name, "do_me";
-                //signal, "*";
-                //source, "button_release";
-                action, SIGNAL_EMIT "candidate,action,clicked" "";
+            part { name: "candidate";
+                type: TEXT;
+                mouse_events: 0;
+                //effect: SHADOW;
+                description { state: "default" 0.0;
+                    color: COLOR_NORMAL_TEXT;
+                    color_class: "text_color";
+                    text {
+                        text_class: "tizen";
+                        text: "";
+                        font: FONT_NAME;
+                        size: FONT_SIZE;
+                        align: 0.0 0.5;
+                        min: 1 0;
+                    }
+                    rel1.to: "bg";
+                    rel1.relative: 0.0 0.0;
+                    rel1.offset: 2 0;
+                    rel2.to: "bg";
+                    rel2.relative: 1.0 1.0;
+                    rel2.offset: -2 0;
+                }
             }
         }
     }
@@ -248,11 +250,12 @@ collections {
                     color: COLOR_NORMAL_TEXT;
                     color_class: "text_color";
                     text {
-                        text_class: "candidate_text_class";
+                        text_class: "tizen";
                         text: "Test";
                         font: FONT_NAME;
                         size: FONT_SIZE;
                         align: 0.5 0.5;
+                        min: 1 0;
                     }
                     rel1.to: "bg";
                     rel1.relative: 0.0 0.0;
@@ -505,10 +508,11 @@ collections {
                     color_class: "text_color";
                     text {
                         text: "aux";
-                        text_class: "aux_text_class";
+                        text_class: "tizen";
                         font: AUX_FONT_NAME;
                         size: AUX_FONT_SIZE;
                         align: 0.5 0.5;
+                        min: 1 0;
                     }
                     rel1.to: "bg";
                     rel1.relative: 0.0 0.0;
index 555b206..289c701 100755 (executable)
@@ -11,3 +11,4 @@
 #define COLOR_PRESS_TEXT        0 0 0 255
 
 #include "isf_candidate.edc"
+#include "isf_minicontrol.edc"
diff --git a/ism/data/pixmaps/isf_minicontrol.edc b/ism/data/pixmaps/isf_minicontrol.edc
new file mode 100644 (file)
index 0000000..b934af7
--- /dev/null
@@ -0,0 +1,220 @@
+#define MC_BG_COLOR             0 0 0 255
+
+#define MC_TITLE_TEXT_FONT      "Tizen:style=Regular"
+#define MC_TITLE_TEXT_CLASS     "tizen"
+#define MC_TITLE_TEXT_SIZE      30
+#define MC_TITLE_TEXT_COLOR     255 255 255 255
+
+#define MC_INFO_TEXT_FONT       "Tizen:style=Medium"
+#define MC_INFO_TEXT_CLASS      "tizen"
+#define MC_INFO_TEXT_SIZE       28
+#define MC_INFO_TEXT_COLOR      170 170 170 255
+#define MC_INFO_REC_COLOR       201 213 213 255
+#define MC_KEYBOARD_ICON        "keyboard.png"
+
+#include "edc_image_macro.edc"
+
+collections{
+RESOURCE_IMAGE("keyboardicon.png");
+RESOURCE_IMAGE("noti_icon_keyboard_connected.png");
+
+    group { name: "mini_controller";
+    parts {
+        part { name: "bg";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+                min: 0 180;
+                fixed: 0 1;
+                align: 0.0 0.0;
+            }
+        }
+
+        part { name: "touch_bg";
+            type : RECT;
+            mouse_events: 1;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.0; to: "bg";}
+                rel2 { relative: 1.0 1.0; to: "bg";}
+                color: MC_BG_COLOR;
+                align: 0.0 0.0;
+                visible: 1;
+            }
+        }
+
+        part { name: "padding_top";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel2 { relative: 1 0; to: "bg"; }
+                min: 0 14;
+                fixed: 0 1;
+                align: 0.0 0.0;
+            }
+        }
+
+        part { name: "padding_left";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.0; to: "bg";}
+                rel2 { relative: 0.0 1.0; to: "bg";}
+                min: 14 0;
+                fixed: 1 0;
+                align: 0.0 0.0;
+            }
+        }
+
+        part { name: "padding_right";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 1.0 0.0; to: "bg";}
+                rel2 { relative: 1.0 1.0; to: "bg";}
+                min: 14 0;
+                fixed: 1 0;
+                align: 1.0 0.0;
+            }
+        }
+
+        part { name: "padding_bottom";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0 1; to: "bg"; }
+                rel2 { relative: 1 1; to: "bg"; }
+                min: 0 14;
+                fixed: 0 1;
+                align: 0.0 1.0;
+            }
+        }
+
+        part { name: "keyboard_icon_area";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 1.0 0.0; to: "padding_left"; }
+                rel2 { relative: 1.0 1.0; to: "padding_left"; }
+                min: 72 72 ;
+                fixed: 1 1;
+                align: 0 0.5;
+            }
+        }
+
+        part { name: "keyboard_icon";
+            type: SWALLOW;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0 0; to: "keyboard_icon_area"; }
+                rel2 { relative: 1 1; to: "keyboard_icon_area"; }
+                min: 72 72;
+                max: 72 72;
+                fixed: 1 1;
+                align: 0.5 0.5;
+                visible: 1;
+            }
+        }
+
+        part { name: "padding_icon_right";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 1.0 0.0; to: "keyboard_icon_area";}
+                rel2 { relative: 1.0 1.0; to: "keyboard_icon_area";}
+                min: 14 0;
+                fixed: 1 0;
+                align: 0.0 0.0;
+            }
+        }
+
+        part { name: "content_area";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 1.0 1.0; to_x: "padding_icon_right"; to_y: "padding_top"; }
+                rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+            }
+        }
+
+        part { name: "text_area";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.5; to: "content_area";}
+                rel2 { relative: 1.0 0.5; to: "content_area";}
+                align: 0.0 0.5;
+                min: 0 80;
+            }
+        }
+
+        part { name: "title_text_area";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.0; to: "text_area";}
+                rel2 { relative: 1.0 0.0; to: "text_area";}
+                min: 0 40;
+                align: 0.0 0.0;
+            }
+        }
+
+        part { name: "title_text";
+            type: SWALLOW;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 0.0; to: "title_text_area"; }
+                rel2 { relative: 1.0 1.0; to: "title_text_area"; }
+                align: 0.0 0.5;
+            }
+        }
+
+        part { name: "info_text_area";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 1.0; to: "title_text"; }
+                rel2 { relative: 1.0 1.0; to: "text_area"; }
+                min: 0 40;
+                align: 0.0 1.0;
+            }
+        }
+
+        part { name: "info_text";
+            type: SWALLOW;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                rel1 { relative: 0.0 1.0; to: "title_text"; }
+                rel2 { relative: 1.0 1.0; to: "title_text"; }
+                align: 0.0 0.0;
+            }
+        }
+    }
+
+    programs {
+        program {
+            name: "minicontrol.touch.down";
+            signal: "mouse,clicked,1";
+            source: "touch_bg";
+            action: SIGNAL_EMIT "selected" "edje";
+        }
+    }
+}
+
diff --git a/ism/data/pixmaps/isfsetting.edc b/ism/data/pixmaps/isfsetting.edc
deleted file mode 100644 (file)
index 1db2605..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#define PADDING_X  25
-#define PADDING_Y  25
-collections {
-       group {
-               name : "isfsetting/languageview";
-               parts {
-                       part {
-                               name:"top_padding";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 PADDING_Y;
-                                       fixed: 0 1;
-                                       rel1 {relative: 0 0;}
-                                       rel2 {relative: 1 0;}
-                                       align: 0 0;
-                                       visible : 0;
-                               }
-                       }
-                       part {
-                               name:"content";
-                               type: SWALLOW;
-                               scale :1;
-                               description {
-                                       state : "default" 0.0;
-                                       rel1 {relative: 0.0 1.0; offset: PADDING_X 0 ;to_y:"top_padding";}
-                               }
-                       }
-               }
-       }
-}
diff --git a/ism/data/pixmaps/keyboardicon.png b/ism/data/pixmaps/keyboardicon.png
new file mode 100755 (executable)
index 0000000..03f3645
Binary files /dev/null and b/ism/data/pixmaps/keyboardicon.png differ
diff --git a/ism/data/pixmaps/noti_icon_keyboard_connected.png b/ism/data/pixmaps/noti_icon_keyboard_connected.png
new file mode 100755 (executable)
index 0000000..ea48742
Binary files /dev/null and b/ism/data/pixmaps/noti_icon_keyboard_connected.png differ
index b6bbc90..6506159 100644 (file)
@@ -38,18 +38,21 @@ isf_demo_efl_SOURCES  = isf_demo_efl.cpp \
                         isf_return_key_disable_efl.cpp \
                         isf_imdata_set_efl.cpp \
                         isf_focus_movement_efl.cpp \
-                        isf_language_efl.cpp
+                        isf_language_efl.cpp \
+                        isf_ondemand_efl.cpp
 
 isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @APPCORE_EFL_CFLAGS@ \
                         @UIGADGET_CFLAGS@ \
                         @VCONF_CFLAGS@ \
+                        @PRIVILEGE_CONTROL_CFLAGS@ \
                         @EFL_ASSIST_CFLAGS@
 
 isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @VCONF_LIBS@ \
                         @APPCORE_EFL_LIBS@ \
                         @UIGADGET_LIBS@ \
+                        @PRIVILEGE_CONTROL_LIBS@ \
                         @EFL_ASSIST_LIBS@
 
 isf_demo_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
index 22d7116..7fcb35b 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <Elementary.h>
 #include <appcore-efl.h>
-#include <ui-gadget.h>
 
 struct appdata {
     int root_w;
@@ -41,13 +40,11 @@ struct appdata {
     Evas_Object *layout_main;     // Layout widget based on EDJ
     Evas_Object *naviframe;
 
-    ui_gadget_h ug;
     int is_frameview;
 
     // Add more variables here
     Evas_Object *li;
     Evas_Object *ev_li;
-    service_h data;
     Eina_Bool vkbd_state;
 };
 
similarity index 52%
rename from ism/extras/efl_setting/include/isf_setting_efl.h
rename to ism/demos/include/isf_ondemand_efl.h
index 15ccf26..b2cb721 100644 (file)
@@ -4,7 +4,7 @@
  * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
  * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
  *
- * Contact: Shuo Liu <shuo0805.liu@samsung.com>, Hengliang Luo <hl.luo@samsung.com>
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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
  *
  */
 
-#ifndef __ISF_SETTING_EFL_H
-#define __ISF_SETTING_EFL_H
+#ifndef __ISE_ONDEMAND_H
+#define __ISE_ONDEMAND_H
 
-#include <dlog.h>
-#define LOG_TAG                                   "ISF_SETTING"
-#define ISFUG_DEBUG(msg, args...) LOGD(msg, ##args)
-#define ISFUG_ERROR(msg, args...) LOGE(msg, ##args)
+#include <Elementary.h>
 
-enum
-{
-    TYPE_KEY_END = 0,
-    // Add more here
-};
+void ise_ondemand_bt (void *data, Evas_Object *obj, void *event_info);
 
-struct ug_data {
-    Evas_Object     *layout_main;
-    Evas_Object     *naviframe;
-    Evas_Object     *opt_eo;
-    Elm_Object_Item *autocapital_item;      // Autocapital option
-    Elm_Object_Item *sw_ise_item_tizen;     // SW
-    Elm_Object_Item *hw_ise_item_tizen;     // HW
-    Elm_Object_Item *sw_ise_opt_item_tizen; // SW option
-    Elm_Object_Item *hw_ise_opt_item_tizen; // HW option
-    Eina_Bool (*key_end_cb)(void *, Elm_Object_Item *);
-    ui_gadget_h      ug;
-};
-
-#endif /* __ISF_SETTING_EFL_H */
+#endif /* __ISE_ONDEMAND_H */
 
 /*
 vi:ts=4:ai:nowrap:expandtab
index def221b..fc2afef 100644 (file)
@@ -29,6 +29,7 @@
 #include <privilege-control.h>
 #include <vconf.h>
 #include <efl_assist.h>
+#include "scim_private.h"
 #include "isf_demo_efl.h"
 #include "isf_imcontrol_efl.h"
 #include "isf_layout_efl.h"
 #include "isf_imdata_set_efl.h"
 #include "isf_focus_movement_efl.h"
 #include "isf_language_efl.h"
+#include "isf_ondemand_efl.h"
 
-#define BASE_THEME_WIDTH 720.0f
+#if HAVE_UIGADGET
+#include <ui-gadget.h>
 
 static void isfsetting_bt (void *data, Evas_Object *obj, void *event_info);
+#endif
 
 static struct _menu_item isf_demo_menu_its[] = {
-    { "ISF IM Control", imcontrolapi_bt },
     { "ISF Layout", ise_layout_bt },
     { "ISF Autocapital", ise_autocapital_bt },
     { "ISF Prediction Allow", ise_prediction_bt },
@@ -54,9 +57,15 @@ static struct _menu_item isf_demo_menu_its[] = {
     { "ISF Return Key Type", ise_return_key_type_bt },
     { "ISF Return Key Disable", ise_return_key_disable_bt },
     { "ISF IM Data", ise_imdata_set_bt },
-    { "ISF Event", isf_event_demo_bt },
+#ifdef _WEARABLE
+    { "ISF ondemand", ise_ondemand_bt },
+#endif
     { "ISF Focus Movement", isf_focus_movement_bt },
+    { "ISF Event", isf_event_demo_bt },
+    { "ISF IM Control", imcontrolapi_bt },
+#if HAVE_UIGADGET
     { "ISF Setting", isfsetting_bt },
+#endif
 
     /* do not delete below */
     { NULL, NULL }
@@ -81,12 +90,13 @@ static void _list_click (void *data, Evas_Object *obj, void *event_info)
         elm_list_item_selected_set (it, EINA_FALSE);
 }
 
+#if HAVE_UIGADGET
 static void layout_cb (ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
     struct appdata *ad = NULL;
     Evas_Object *base = NULL;
 
-    if ( ug == NULL || priv == NULL)
+    if (ug == NULL || priv == NULL)
         return;
 
     ad = (appdata *)priv;
@@ -138,12 +148,11 @@ static void isfsetting_bt (void *data, Evas_Object *obj, void *event_info)
     cbs.result_cb  = result_cb;
     cbs.destroy_cb = destroy_cb;
     cbs.priv       = ad;
-    ad->ug = ug_create (NULL, "isfsetting-efl",
-                        UG_MODE_FULLVIEW,
-                        ad->data, &cbs);
-    service_destroy (ad->data);
-    ad->data = NULL;
+    ug_create (NULL, "isfsetting-efl",
+               UG_MODE_FULLVIEW,
+               NULL, &cbs);
 }
+#endif
 
 static int create_demo_view (struct appdata *ad)
 {
@@ -178,7 +187,9 @@ static int lang_changed (void *data)
     if (ad->layout_main == NULL)
         return 0;
 
+#if HAVE_UIGADGET
     ug_send_event (UG_EVENT_LANG_CHANGE);
+#endif
     return 0;
 }
 
@@ -281,11 +292,11 @@ static Eina_Bool _keydown_event (void *data, int type, void *event)
 {
     Ecore_Event_Key *ev = (Ecore_Event_Key *)event;
     struct appdata *ad = (struct appdata *)data;
-    if (ad == NULL || ev == NULL) return ECORE_CALLBACK_RENEW;
+    if (ad == NULL || ev == NULL) return ECORE_CALLBACK_PASS_ON;
 
     printf ("[ecore key down] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose);
 
-    return ECORE_CALLBACK_RENEW;
+    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool _keyup_event (void *data, int type, void *event)
@@ -294,7 +305,7 @@ static Eina_Bool _keyup_event (void *data, int type, void *event)
 
     printf ("[ecore key up] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose);
 
-    return ECORE_CALLBACK_RENEW;
+    return ECORE_CALLBACK_PASS_ON;
 }
 
 static void input_panel_state_changed_cb (keynode_t *key, void* data)
@@ -330,10 +341,6 @@ static int app_create (void *data)
     /* get width and height of main window */
     evas_object_geometry_get (ad->win_main, NULL, NULL, &ad->root_w, &ad->root_h);
 
-    if (ad->root_w >= 0) {
-        elm_config_scale_set (ad->root_w / BASE_THEME_WIDTH);
-    }
-
     ad->layout_main = create_layout_main (ad);
 
     // Indicator
@@ -401,6 +408,8 @@ static int app_resume (void *data)
 
 int main (int argc, char *argv[])
 {
+    set_app_privilege ("isf", NULL, NULL);
+
     struct appdata ad;
     struct appcore_ops ops;
 
diff --git a/ism/demos/isf_ondemand_efl.cpp b/ism/demos/isf_ondemand_efl.cpp
new file mode 100644 (file)
index 0000000..78e8752
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * ISF(Input Service Framework)
+ *
+ * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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 "isf_demo_efl.h"
+#include "isf_ondemand_efl.h"
+
+static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text, Eina_Bool ondemand)
+{
+    Evas_Object *ef = create_ef (parent, label, guide_text);
+    Evas_Object *en = elm_object_part_content_get (ef, "elm.icon.entry");
+#ifdef _WEARABLE
+    elm_entry_input_panel_show_on_demand_set (en, ondemand);
+#endif
+
+    return ef;
+}
+
+static Evas_Object * create_inner_layout (void *data)
+{
+    struct appdata *ad = (struct appdata *)data;
+    Evas_Object *bx = NULL;
+    Evas_Object *ef = NULL;
+
+    Evas_Object *parent = ad->naviframe;
+
+    bx = elm_box_add (parent);
+    evas_object_size_hint_weight_set (bx, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (bx, EVAS_HINT_FILL, 0.0);
+    evas_object_show (bx);
+
+    /* Show on demand : TRUE */
+    ef = _create_ef_layout (parent, _("Show on demand : TRUE"), _("click to enter"), EINA_TRUE);
+    elm_box_pack_end (bx, ef);
+
+    /* Show on demand : FALSE */
+    ef = _create_ef_layout (parent, _("Show on demand : FALSE"), _("click to enter"), EINA_FALSE);
+    elm_box_pack_end (bx, ef);
+
+    return bx;
+}
+
+void ise_ondemand_bt (void *data, Evas_Object *obj, void *event_info)
+{
+    Evas_Object *lay_inner = create_inner_layout (data);
+    add_layout_to_naviframe (data, lay_inner, _("Show on demand"));
+}
+
+/*
+vi:ts=4:ai:nowrap:expandtab
+*/
index 311c204..65bee7b 100644 (file)
@@ -18,4 +18,4 @@
 MAINTAINERCLEANFILES   = Makefile.in
 CLEANFILES             = *.bak
 
-SUBDIRS                        = gtk2_immodule efl_panel efl_immodule efl_setting
+SUBDIRS                        = gtk2_immodule efl_panel efl_immodule
index 95ecefa..364f893 100644 (file)
@@ -37,8 +37,7 @@ libisf_imf_module_la_SOURCES  = isf_imf_module.cpp \
 libisf_imf_module_la_CXXFLAGS = @EFL_CFLAGS@ \
                                 @UTILX_CFLAGS@ \
                                 @VCONF_CFLAGS@ \
-                                @DLOG_CFLAGS@\
-                                @NOTIFICATION_CFLAGS@
+                                @DLOG_CFLAGS@
 
 libisf_imf_module_la_LDFLAGS  = -rpath $(moduledir) \
                                 -avoid-version \
@@ -50,5 +49,4 @@ libisf_imf_module_la_LIBADD  =  -lstdc++ \
                                 @UTILX_LIBS@ \
                                 @VCONF_LIBS@ \
                                 @DLOG_LIBS@ \
-                                @NOTIFICATION_LIBS@\
                                 $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
index 673fb4a..f190158 100644 (file)
@@ -46,7 +46,6 @@
 #include <utilX.h>
 #include <vconf.h>
 #include <vconf-keys.h>
-#include <notification.h>
 
 #include "scim_private.h"
 #include "scim.h"
@@ -145,6 +144,10 @@ static void     panel_slot_get_surrounding_text         (int
 static void     panel_slot_delete_surrounding_text      (int                     context,
                                                          int                     offset,
                                                          int                     len);
+static void     panel_slot_get_selection                (int                     context);
+static void     panel_slot_set_selection                (int                     context,
+                                                         int                     start,
+                                                         int                     end);
 
 static void     panel_req_focus_in                      (EcoreIMFContextISF     *ic);
 static void     panel_req_update_factory_info           (EcoreIMFContextISF     *ic);
@@ -177,6 +180,7 @@ static void     initialize_modifier_bits                (Display *display);
 static unsigned int scim_x11_keymask_scim_to_x11        (Display *display, uint16 scimkeymask);
 static XKeyEvent createKeyEvent                         (bool press, int keycode, int modifiers, bool fake);
 static void     send_x_key_event                        (const KeyEvent &key, bool fake);
+static int      _keyname_to_keycode                     (const char *keyname);
 static void     _hide_preedit_string                    (int context, bool update_preedit);
 
 static void     attach_instance                         (const IMEngineInstancePointer &si);
@@ -226,6 +230,11 @@ static bool     slot_get_surrounding_text               (IMEngineInstanceBase
 static bool     slot_delete_surrounding_text            (IMEngineInstanceBase   *si,
                                                          int                     offset,
                                                          int                     len);
+static bool     slot_get_selection                      (IMEngineInstanceBase   *si,
+                                                         WideString             &text);
+static bool     slot_set_selection                      (IMEngineInstanceBase   *si,
+                                                         int                     start,
+                                                         int                     end);
 
 static void     slot_expand_candidate                   (IMEngineInstanceBase   *si);
 static void     slot_contract_candidate                 (IMEngineInstanceBase   *si);
@@ -238,7 +247,6 @@ static void     reload_config_callback                  (const ConfigPointer
 
 static void     fallback_commit_string_cb               (IMEngineInstanceBase   *si,
                                                          const WideString       &str);
-static void     _display_input_language                 (EcoreIMFContextISF *ic);
 
 /* Local variables declaration */
 static String                                           _language;
@@ -270,9 +278,13 @@ static IMEngineInstancePointer                          _fallback_instance;
 PanelClient                                             _panel_client;
 static int                                              _panel_client_id            = 0;
 
+static bool                                             _panel_initialized          = false;
+static int                                              _active_helper_option       = 0;
+
 static Ecore_Fd_Handler                                *_panel_iochannel_read_handler = 0;
 static Ecore_Fd_Handler                                *_panel_iochannel_err_handler  = 0;
 
+static Ecore_X_Window                                   _input_win                  = 0;
 static Ecore_X_Window                                   _client_window              = 0;
 static Ecore_Event_Handler                             *_key_down_handler           = 0;
 static Ecore_Event_Handler                             *_key_up_handler             = 0;
@@ -287,6 +299,8 @@ static Eina_Bool                                        desktop_mode
 
 static bool                                             _x_key_event_is_valid       = false;
 
+static Ecore_Timer                                     *_click_timer                = NULL;
+
 typedef enum {
     INPUT_LANG_JAPANESE,
     INPUT_LANG_OTHER
@@ -307,6 +321,8 @@ static int      __current_numlock_mask = Mod2Mask;
 #define SHIFT_MODE_ENABLE 0x9fe7
 #define SHIFT_MODE_DISABLE 0x9fe8
 
+#define E_PROP_DEVICEMGR_INPUTWIN                       "DeviceMgr Input Window"
+
 extern Ecore_IMF_Input_Panel_State  input_panel_state;
 extern Ecore_IMF_Input_Panel_State  notified_state;
 extern Ecore_IMF_Context           *input_panel_ctx;
@@ -344,19 +360,6 @@ get_desktop_mode ()
     return desktop_mode;
 }
 
-static unsigned int
-get_time (void)
-{
-    unsigned int tint;
-    struct timeval tv;
-    struct timezone tz;           /* is not used since ages */
-    gettimeofday (&tv, &tz);
-    tint = tv.tv_sec * 1000;
-    tint = tint / 1000 * 1000;
-    tint = tint + tv.tv_usec / 1000;
-    return tint;
-}
-
 /* Function Implementations */
 static EcoreIMFContextISFImpl *
 new_ic_impl (EcoreIMFContextISF *parent)
@@ -374,7 +377,7 @@ new_ic_impl (EcoreIMFContextISF *parent)
 
     impl->autocapital_type = ECORE_IMF_AUTOCAPITAL_TYPE_NONE;
     impl->next_shift_status = 0;
-    impl->shift_mode_enabled = 1;
+    impl->shift_mode_enabled = 0;
     impl->next = _used_ic_impl_list;
     _used_ic_impl_list = impl;
 
@@ -460,6 +463,30 @@ check_valid_ic (EcoreIMFContextISF * ic)
 }
 
 static Eina_Bool
+_panel_show (void *data)
+{
+    Ecore_IMF_Context *active_ctx = get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW);
+
+    if (!active_ctx)
+        return ECORE_CALLBACK_CANCEL;
+
+    ecore_imf_context_input_panel_show (active_ctx);
+
+    return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_click_check (void *data)
+{
+    if (_click_timer) {
+        ecore_timer_del (_click_timer);
+        _click_timer = NULL;
+    }
+
+    return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
 _key_down_cb (void *data, int type, void *event)
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
@@ -482,6 +509,7 @@ _key_up_cb (void *data, int type, void *event)
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
+    unsigned int val = 0;
     Ecore_IMF_Context *active_ctx = get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW);
 
     Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event;
@@ -493,6 +521,24 @@ _key_up_cb (void *data, int type, void *event)
         isf_imf_context_reset (active_ctx);
         isf_imf_context_input_panel_instant_hide (active_ctx);
         return ECORE_CALLBACK_CANCEL;
+    } else if (!strcmp (ev->keyname, "XF86MenuKB")) {
+        if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
+            ecore_imf_context_input_panel_hide (active_ctx);
+        } else {
+            if (_click_timer == NULL) {
+                if (get_hardware_keyboard_mode ()) {
+                    ecore_x_window_prop_card32_set (_input_win, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1);
+                    ecore_timer_add (0.1, _panel_show, NULL);
+                } else {
+                    ecore_imf_context_input_panel_show (active_ctx);
+                }
+                _click_timer = ecore_timer_add (0.4, _click_check, NULL);
+            } else {
+                LOGD ("Skip toggle key input");
+                ecore_timer_del (_click_timer);
+                _click_timer = ecore_timer_add (0.4, _click_check, NULL);
+            }
+        }
     }
 
     return ECORE_CALLBACK_RENEW;
@@ -685,6 +731,9 @@ analyze_surrounding_text (Ecore_IMF_Context *ctx)
     if (context_scim->impl->cursor_pos == 0)
         return EINA_TRUE;
 
+    if (context_scim->impl->preedit_updating)
+        return EINA_FALSE;
+
     ecore_imf_context_surrounding_get (ctx, &markup_str, &cursor_pos);
     if (!markup_str) goto done;
 
@@ -757,7 +806,7 @@ caps_mode_check (Ecore_IMF_Context *ctx, Eina_Bool force, Eina_Bool noti)
     Eina_Bool uppercase;
     EcoreIMFContextISF *context_scim;
 
-    if (hw_keyboard_num_get () > 0) return EINA_FALSE;
+    if (get_hardware_keyboard_mode ()) return EINA_FALSE;
 
     if (!ctx) return EINA_FALSE;
     context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx);
@@ -823,18 +872,46 @@ window_to_screen_geometry_get (Ecore_X_Window client_win, int *x, int *y)
         *y = sum_y;
 }
 
-static void
-evas_focus_out_cb (void *data, Evas *e, void *event_info)
+static unsigned int
+_ecore_imf_modifier_to_scim_mask (unsigned int modifiers)
 {
-    Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)data;
+   unsigned int mask = 0;
 
-    if (!ctx) return;
+   /**< "Control" is pressed */
+   if (modifiers & ECORE_IMF_KEYBOARD_MODIFIER_CTRL)
+     mask |= SCIM_KEY_ControlMask;
 
-    LOGD ("ctx : %p\n", ctx);
+   /**< "Alt" is pressed */
+   if (modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALT)
+     mask |= SCIM_KEY_AltMask;
 
-    if (input_panel_ctx == ctx && _scim_initialized) {
-        isf_imf_context_input_panel_instant_hide (ctx);
-    }
+   /**< "Shift" is pressed */
+   if (modifiers & ECORE_IMF_KEYBOARD_MODIFIER_SHIFT)
+     mask |= SCIM_KEY_ShiftMask;
+
+   /**< "Win" (between "Ctrl" and "Alt") is pressed */
+   if (modifiers & ECORE_IMF_KEYBOARD_MODIFIER_WIN)
+     mask |= SCIM_KEY_SuperMask;
+
+   /**< "AltGr" is pressed */
+   if (modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALTGR)
+     mask |= SCIM_KEY_Mod5Mask;
+
+   return mask;
+}
+
+static unsigned int
+_ecore_imf_lock_to_scim_mask (unsigned int locks)
+{
+   unsigned int mask = 0;
+
+   if (locks & ECORE_IMF_KEYBOARD_LOCK_CAPS)
+     mask |= SCIM_KEY_CapsLockMask;
+
+   if (locks & ECORE_IMF_KEYBOARD_LOCK_NUM)
+     mask |= SCIM_KEY_NumLockMask;
+
+   return mask;
 }
 
 static void
@@ -1011,6 +1088,7 @@ isf_imf_context_add (Ecore_IMF_Context *ctx)
         if (factory.null ()) return;
         si = factory->create_instance ("UTF-8", _instance_count++);
         if (si.null ()) return;
+        LOGD ("create_instance: %s",si->get_factory_uuid ().c_str ());
         attach_instance (si);
         SCIM_DEBUG_FRONTEND(2) << "create new instance: " << si->get_id () << " " << si->get_factory_uuid () << "\n";
     }
@@ -1070,6 +1148,7 @@ isf_imf_context_del (Ecore_IMF_Context *ctx)
     if (!_ic_list) return;
 
     EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get (ctx);
+    Ecore_IMF_Input_Panel_State input_panel_state = ecore_imf_context_input_panel_state_get (ctx);
 
     if (context_scim) {
         if (context_scim->id != _ic_list->id) {
@@ -1094,16 +1173,17 @@ isf_imf_context_del (Ecore_IMF_Context *ctx)
         if (context_scim == _focused_ic)
             context_scim->impl->si->focus_out ();
 
-        if (context_scim->impl->client_canvas)
-            evas_event_callback_del_full (context_scim->impl->client_canvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, evas_focus_out_cb, ctx);
-
         if (input_panel_ctx == ctx && _scim_initialized) {
             LOGD ("ctx : %p\n", ctx);
+            if (input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW ||
+                input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
+                ecore_imf_context_input_panel_hide (ctx);
+                isf_imf_context_input_panel_send_will_hide_ack (ctx);
+            }
+
             if (notified_state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW ||
                 notified_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-                ecore_imf_context_input_panel_hide (ctx);
                 input_panel_event_callback_call (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE);
-                isf_imf_context_input_panel_send_will_hide_ack (ctx);
             }
         }
 
@@ -1169,8 +1249,6 @@ isf_imf_context_client_canvas_set (Ecore_IMF_Context *ctx, void *canvas)
 
     if (context_scim && context_scim->impl && context_scim->impl->client_canvas != (Evas*) canvas) {
         context_scim->impl->client_canvas = (Evas*)canvas;
-
-        evas_event_callback_add (context_scim->impl->client_canvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, evas_focus_out_cb, ctx);
     }
 }
 
@@ -1224,6 +1302,9 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx)
     if (!context_scim)
         return;
 
+    if (!_panel_initialized)
+        panel_initialize ();
+
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__<< "(" << context_scim->id << ")...\n";
 
     if (_focused_ic) {
@@ -1314,19 +1395,28 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx)
         }
 
         _panel_client.send ();
-        if (caps_mode_check (ctx, EINA_FALSE, EINA_TRUE) == EINA_FALSE) {
-            context_scim->impl->next_shift_status = 0;
-        }
+        context_scim->impl->next_shift_status = 0;
+        context_scim->impl->shift_mode_enabled = 0;
     }
 
-    LOGD ("ctx : %p\n", ctx);
+#ifdef _WEARABLE
+    LOGD ("ctx : %p. on demand : %d\n", ctx, ecore_imf_context_input_panel_show_on_demand_get (ctx));
+#endif
 
-    if (ecore_imf_context_input_panel_enabled_get (ctx))
+    if (ecore_imf_context_input_panel_enabled_get (ctx)) {
+#ifdef _WEARABLE
+        if (!ecore_imf_context_input_panel_show_on_demand_get (ctx))
+            ecore_imf_context_input_panel_show (ctx);
+        else
+            LOGD ("ctx : %p input panel on demand mode : TRUE\n", ctx);
+#else
         ecore_imf_context_input_panel_show (ctx);
+#endif
+    }
     else
         LOGD ("ctx : %p input panel enable : FALSE\n", ctx);
 
-    if (hw_keyboard_num_get () > 0)
+    if (get_hardware_keyboard_mode ())
         clear_hide_request ();
 }
 
@@ -1820,47 +1910,63 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type,
     EcoreIMFContextISF *ic = (EcoreIMFContextISF*)ecore_imf_context_data_get (ctx);
     Eina_Bool ret = EINA_FALSE;
 
-    if (ic == NULL || ic->impl == NULL)
+    if (ic == NULL || ic->impl == NULL) {
+        LOGW ("ic is NULL\n");
         return ret;
+    }
+    KeyEvent key;
 
-    if (type == ECORE_IMF_EVENT_KEY_DOWN || type == ECORE_IMF_EVENT_KEY_UP) {
-        if (hw_keyboard_num_get () == 0 && !_x_key_event_is_valid) {
-            std::cerr << "    Hardware keyboard is not connected and key event is not valid!!!\n";
-            return EINA_TRUE;
+    /* Hardware input detect code */
+    if (type == ECORE_IMF_EVENT_KEY_DOWN) {
+        Ecore_IMF_Event_Key_Down *ev = (Ecore_IMF_Event_Key_Down *)event;
+        if (ev->timestamp > 1 && get_hardware_keyboard_mode () == EINA_FALSE &&
+            scim_string_to_key (key, ev->key) &&
+            key.code != 0xFF69 /* Cancel (Power + Volume down) key */) {
+            isf_imf_context_set_hardware_keyboard_mode (ctx);
+            _panel_client.prepare (ic->id);
+            _panel_client.get_active_helper_option (&_active_helper_option);
+            _panel_client.send ();
+            LOGD ("Hardware keyboard mode, active helper option: %d", _active_helper_option);
         }
     }
 
-    KeyEvent key;
     unsigned int timestamp;
 
+    if (type == ECORE_IMF_EVENT_KEY_DOWN || type == ECORE_IMF_EVENT_KEY_UP) {
+        if (type == ECORE_IMF_EVENT_KEY_DOWN) {
+            Ecore_IMF_Event_Key_Down *ev = (Ecore_IMF_Event_Key_Down *)event;
+            timestamp = ev->timestamp;
+        } else {
+            Ecore_IMF_Event_Key_Up *ev = (Ecore_IMF_Event_Key_Up *)event;
+            timestamp = ev->timestamp;
+        }
+        if ((timestamp == 0 || timestamp == 1) && !_x_key_event_is_valid) {
+            std::cerr << "    S/W key event is not valid!!!\n";
+            LOGW ("S/W key event is not valid\n");
+            return EINA_TRUE;
+        }
+    }
+
     if (type == ECORE_IMF_EVENT_KEY_DOWN) {
         Ecore_IMF_Event_Key_Down *ev = (Ecore_IMF_Event_Key_Down *)event;
         timestamp = ev->timestamp;
         scim_string_to_key (key, ev->key);
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) key.mask |=SCIM_KEY_ShiftMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_CTRL) key.mask |=SCIM_KEY_ControlMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALT) key.mask |=SCIM_KEY_AltMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALTGR) key.mask |=SCIM_KEY_Mod5Mask;
-        if (ev->locks & ECORE_IMF_KEYBOARD_LOCK_CAPS) key.mask |=SCIM_KEY_CapsLockMask;
-        if (ev->locks & ECORE_IMF_KEYBOARD_LOCK_NUM) key.mask |=SCIM_KEY_NumLockMask;
+        key.mask |= _ecore_imf_modifier_to_scim_mask (ev->modifiers);
+        key.mask |= _ecore_imf_lock_to_scim_mask (ev->locks);
     } else if (type == ECORE_IMF_EVENT_KEY_UP) {
         Ecore_IMF_Event_Key_Up *ev = (Ecore_IMF_Event_Key_Up *)event;
         timestamp = ev->timestamp;
         scim_string_to_key (key, ev->key);
         key.mask = SCIM_KEY_ReleaseMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) key.mask |=SCIM_KEY_ShiftMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_CTRL) key.mask |=SCIM_KEY_ControlMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALT) key.mask |=SCIM_KEY_AltMask;
-        if (ev->modifiers & ECORE_IMF_KEYBOARD_MODIFIER_ALTGR) key.mask |=SCIM_KEY_Mod5Mask;
-        if (ev->locks & ECORE_IMF_KEYBOARD_LOCK_CAPS) key.mask |=SCIM_KEY_CapsLockMask;
-        if (ev->locks & ECORE_IMF_KEYBOARD_LOCK_NUM) key.mask |=SCIM_KEY_NumLockMask;
+        key.mask |= _ecore_imf_modifier_to_scim_mask (ev->modifiers);
+        key.mask |= _ecore_imf_lock_to_scim_mask (ev->locks);
     } else if (type == ECORE_IMF_EVENT_MOUSE_UP) {
         if (ecore_imf_context_input_panel_enabled_get (ctx)) {
             LOGD ("[Mouse-up event] ctx : %p\n", ctx);
             if (ic == _focused_ic)
                 ecore_imf_context_input_panel_show (ctx);
             else
-                LOGW ("Can't show IME because there is no focus. ctx : %p\n", ctx);
+                LOGE ("Can't show IME because there is no focus. ctx : %p\n", ctx);
         }
         return EINA_FALSE;
     } else {
@@ -1897,10 +2003,15 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type,
             _panel_client.send ();
             return ret;
         }
-
-        if (!_focused_ic || !_focused_ic->impl || !_focused_ic->impl->is_on ||
-            !_focused_ic->impl->si->process_key_event (key)) {
+        if (!_focused_ic || !_focused_ic->impl || !_focused_ic->impl->is_on) {
             ret = EINA_FALSE;
+        } else if (get_hardware_keyboard_mode () && (_active_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)) {
+            _panel_client.process_key_event (key, (int*)&ret);
+        } else {
+            ret = _focused_ic->impl->si->process_key_event (key);
+        }
+
+        if (ret == EINA_FALSE) {
             if (type == ECORE_IMF_EVENT_KEY_DOWN) {
                 if (key.code == SCIM_KEY_space ||
                     key.code == SCIM_KEY_KP_Space)
@@ -1981,7 +2092,7 @@ panel_slot_update_candidate_item_layout (int context, const std::vector<uint32>
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " row size=" << row_items.size () << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->update_candidate_item_layout (row_items);
         _panel_client.send ();
@@ -1993,7 +2104,7 @@ panel_slot_update_lookup_table_page_size (int context, int page_size)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " page_size=" << page_size << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->update_lookup_table_page_size (page_size);
         _panel_client.send ();
@@ -2005,7 +2116,7 @@ panel_slot_lookup_table_page_up (int context)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->lookup_table_page_up ();
         _panel_client.send ();
@@ -2017,7 +2128,7 @@ panel_slot_lookup_table_page_down (int context)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->lookup_table_page_down ();
         _panel_client.send ();
@@ -2042,8 +2153,9 @@ panel_slot_process_helper_event (int context, const String &target_uuid, const S
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " target=" << target_uuid
                            << " helper=" << helper_uuid << " ic=" << ic << " ic->impl=" << (ic != NULL ? ic->impl : 0) << " ic-uuid="
-                           << ((ic && ic->impl) ? ic->impl->si->get_factory_uuid () : "" ) << "\n";
-    if (ic && ic->impl && ic->impl->si->get_factory_uuid () == target_uuid) {
+                           << ((ic && ic->impl) ? ic->impl->si->get_factory_uuid () : "" ) << " _focused_ic=" << _focused_ic << "\n";
+    if (ic && ic->impl && _focused_ic == ic && ic->impl->is_on && ic->impl->si &&
+        ic->impl->si->get_factory_uuid () == target_uuid) {
         _panel_client.prepare (ic->id);
         SCIM_DEBUG_FRONTEND(2) << "call process_helper_event\n";
         ic->impl->si->process_helper_event (helper_uuid, trans);
@@ -2056,7 +2168,7 @@ panel_slot_move_preedit_caret (int context, int caret_pos)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " caret=" << caret_pos << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->move_preedit_caret (caret_pos);
         _panel_client.send ();
@@ -2093,7 +2205,7 @@ panel_slot_select_aux (int context, int aux_index)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " aux=" << aux_index << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->select_aux (aux_index);
         _panel_client.send ();
@@ -2105,7 +2217,7 @@ panel_slot_select_candidate (int context, int cand_index)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " candidate=" << cand_index << " ic=" << ic << "\n";
-    if (ic && ic->impl) {
+    if (ic && ic->impl && _focused_ic == ic) {
         _panel_client.prepare (ic->id);
         ic->impl->si->select_candidate (cand_index);
         _panel_client.send ();
@@ -2142,6 +2254,7 @@ feed_key_event (EcoreIMFContextISF *ic, const KeyEvent &key, bool fake)
         send_x_key_event (key, fake);
         return EINA_TRUE;
     } else {
+        LOGW ("Unknown key code : %d\n", key.code);
         return EINA_FALSE;
     }
 }
@@ -2150,14 +2263,16 @@ static void
 panel_slot_process_key_event (int context, const KeyEvent &key)
 {
     EcoreIMFContextISF *ic = find_ic (context);
-    Eina_Bool process_key = EINA_TRUE;
+
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string () << " ic=" << ic << "\n";
 
     if (!(ic && ic->impl))
         return;
 
-    if ((_focused_ic != NULL) && (_focused_ic != ic))
+    if ((_focused_ic != NULL) && (_focused_ic != ic)) {
+        LOGW ("focused_ic : %p, ic : %p\n", _focused_ic, ic);
         return;
+    }
 
     KeyEvent _key = key;
     if (key.is_key_press () &&
@@ -2166,10 +2281,10 @@ panel_slot_process_key_event (int context, const KeyEvent &key)
             key.code == SHIFT_MODE_ON ||
             key.code == SHIFT_MODE_LOCK) {
             ic->impl->next_shift_status = _key.code;
-        } else if (key.code == SHIFT_MODE_ENABLE ) {
+        } else if (key.code == SHIFT_MODE_ENABLE) {
             ic->impl->shift_mode_enabled = true;
             caps_mode_check (ic->ctx, EINA_TRUE, EINA_TRUE);
-        } else if (key.code == SHIFT_MODE_DISABLE ) {
+        } else if (key.code == SHIFT_MODE_DISABLE) {
             ic->impl->shift_mode_enabled = false;
         }
     }
@@ -2180,25 +2295,15 @@ panel_slot_process_key_event (int context, const KeyEvent &key)
         key.code != SHIFT_MODE_ENABLE &&
         key.code != SHIFT_MODE_DISABLE) {
         if (feed_key_event (ic, _key, false)) return;
-    }
-
-    if (key.code == SHIFT_MODE_ENABLE ||
-        key.code == SHIFT_MODE_DISABLE) {
-        process_key = EINA_FALSE;
-    }
-
-    _panel_client.prepare (ic->id);
-
-    if (!filter_hotkeys (ic, _key)) {
-        if (process_key) {
+        _panel_client.prepare (ic->id);
+        if (!filter_hotkeys (ic, _key)) {
             if (!_focused_ic || !_focused_ic->impl->is_on ||
                     !_focused_ic->impl->si->process_key_event (_key)) {
                 _fallback_instance->process_key_event (_key);
             }
         }
+        _panel_client.send ();
     }
-
-    _panel_client.send ();
 }
 
 static void
@@ -2208,8 +2313,10 @@ panel_slot_commit_string (int context, const WideString &wstr)
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " str=" << utf8_wcstombs (wstr) << " ic=" << ic << "\n";
 
     if (ic && ic->impl) {
-        if (_focused_ic != ic)
+        if (_focused_ic != ic) {
+            LOGW ("focused_ic is different from ic\n");
             return;
+        }
 
         if (utf8_wcstombs (wstr) == String (" ") || utf8_wcstombs (wstr) == String (" "))
             autoperiod_insert (ic->ctx);
@@ -2218,6 +2325,8 @@ panel_slot_commit_string (int context, const WideString &wstr)
             _hide_preedit_string (ic->id, false);
         ecore_imf_context_commit_event_add (ic->ctx, utf8_wcstombs (wstr).c_str ());
         ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs (wstr).c_str ());
+    } else {
+        LOGW ("No ic\n");
     }
 }
 
@@ -2226,15 +2335,22 @@ panel_slot_forward_key_event (int context, const KeyEvent &key)
 {
     EcoreIMFContextISF *ic = find_ic (context);
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string () << " ic=" << ic << "\n";
+    LOGD ("forward key event requested\n");
 
-    if (!(ic && ic->impl))
+    if (!(ic && ic->impl)) {
+        LOGW ("No ic\n");
         return;
+    }
 
-    if ((_focused_ic != NULL) && (_focused_ic != ic))
+    if ((_focused_ic != NULL) && (_focused_ic != ic)) {
+        LOGW ("focused_ic : %p, ic : %p\n", _focused_ic, ic);
         return;
+    }
 
-    if (strlen (key.get_key_string ().c_str ()) >= 116)
+    if (strlen (key.get_key_string ().c_str ()) >= 116) {
+        LOGW ("the length of key string is too long\n");
         return;
+    }
 
     feed_key_event (ic, key, true);
 }
@@ -2459,6 +2575,33 @@ panel_slot_delete_surrounding_text (int context, int offset, int len)
 }
 
 static void
+panel_slot_get_selection (int context)
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+    EcoreIMFContextISF *ic = find_ic (context);
+
+    if (ic && ic->impl && _focused_ic == ic && ic->impl->si) {
+        WideString text = WideString ();
+        slot_get_selection (ic->impl->si, text);
+        _panel_client.prepare (ic->id);
+        _panel_client.update_selection (ic->id, text);
+        _panel_client.send ();
+    }
+}
+
+static void
+panel_slot_set_selection (int context, int start, int end)
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+    EcoreIMFContextISF *ic = find_ic (context);
+
+    if (ic && ic->impl && _focused_ic == ic && ic->impl->si)
+        slot_set_selection (ic->impl->si, start, end);
+}
+
+static void
 panel_slot_update_displayed_candidate_number (int context, int number)
 {
     EcoreIMFContextISF *ic = find_ic (context);
@@ -2644,19 +2787,16 @@ filter_hotkeys (EcoreIMFContextISF *ic, const KeyEvent &key)
                 _panel_client.hide_lookup_table (ic->id);
             }
 
-            _display_input_language (ic);
             ret = true;
         }
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_ON) {
         if (!ic->impl->is_on) {
             turn_on_ic (ic);
-            _display_input_language (ic);
         }
         ret = true;
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_OFF) {
         if (ic->impl->is_on) {
             turn_off_ic (ic);
-            _display_input_language (ic);
         }
         ret = true;
     } else if (hotkey_action == SCIM_FRONTEND_HOTKEY_NEXT_FACTORY) {
@@ -2681,10 +2821,87 @@ filter_hotkeys (EcoreIMFContextISF *ic, const KeyEvent &key)
 }
 
 static bool
+check_socket_frontend (void)
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+    SocketAddress address;
+    SocketClient client;
+
+    uint32 magic;
+
+    address.set_address (scim_get_default_socket_frontend_address ());
+
+    if (!client.connect (address)) {
+        LOGW ("check_socket_frontend's connect () failed.\n");
+        return false;
+    }
+
+    if (!scim_socket_open_connection (magic,
+                                      String ("ConnectionTester"),
+                                      String ("SocketFrontEnd"),
+                                      client,
+                                      1000)) {
+        LOGW ("check_socket_frontend's scim_socket_open_connection () failed.\n");
+        return false;
+    }
+
+    return true;
+}
+
+static int
+launch_socket_frontend ()
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+    std::vector<String>     engine_list;
+    std::vector<String>     helper_list;
+    std::vector<String>     load_engine_list;
+
+    std::vector<String>::iterator it;
+
+    std::cerr << "Launching a ISF daemon with Socket FrontEnd...\n";
+    //get modules list
+    scim_get_imengine_module_list (engine_list);
+    scim_get_helper_module_list (helper_list);
+
+    for (it = engine_list.begin (); it != engine_list.end (); it++) {
+        if (*it != "socket")
+            load_engine_list.push_back (*it);
+    }
+    for (it = helper_list.begin (); it != helper_list.end (); it++)
+        load_engine_list.push_back (*it);
+
+    const char *new_argv [] = { "--no-stay", 0 };
+    return scim_launch (true,
+        "simple",
+        (load_engine_list.size () > 0 ? scim_combine_string_list (load_engine_list, ',') : "none"),
+        "socket",
+        (char **)new_argv);
+}
+
+static bool
 panel_initialize (void)
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
+    /* Before initializing panel client, make sure the socket frontend is running */
+    if (!check_socket_frontend ()) {
+        bool connected = false;
+        /* Make sure we are not retrying for more than 10 seconds */
+        for (int i = 0; i < 100; ++i) {
+            if (check_socket_frontend ()) {
+                connected = true;
+                break;
+            }
+            scim_usleep (100000);
+        }
+        if (!connected) {
+            LOGD ("Socket FrontEnd does not exist, launching new one\n");
+            launch_socket_frontend ();
+        }
+    }
+
     String display_name;
     {
         const char *p = getenv ("DISPLAY");
@@ -2728,6 +2945,8 @@ panel_initialize (void)
             }
         }
 
+        _panel_initialized = true;
+
         return true;
     }
     std::cerr << "panel_initialize () failed!!!\n";
@@ -2739,6 +2958,7 @@ panel_finalize (void)
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
+    _panel_initialized = false;
     _panel_client.close_connection ();
 
     if (_panel_iochannel_read_handler) {
@@ -2759,12 +2979,10 @@ panel_iochannel_handler (void *data, Ecore_Fd_Handler *fd_handler)
     if (fd_handler == _panel_iochannel_read_handler) {
         if (_panel_client.has_pending_event () && !_panel_client.filter_event ()) {
             panel_finalize ();
-            panel_initialize ();
             return ECORE_CALLBACK_CANCEL;
         }
     } else if (fd_handler == _panel_iochannel_err_handler) {
         panel_finalize ();
-        panel_initialize ();
         return ECORE_CALLBACK_CANCEL;
     }
     return ECORE_CALLBACK_RENEW;
@@ -2825,6 +3043,8 @@ turn_off_ic (EcoreIMFContextISF *ic)
 
 //            panel_req_update_factory_info (ic);
             _panel_client.turn_off (ic->id);
+            _panel_client.hide_aux_string (ic->id);
+            _panel_client.hide_lookup_table (ic->id);
         }
 
         //Record the IC on/off status
@@ -2863,32 +3083,6 @@ set_ic_capabilities (EcoreIMFContextISF *ic)
     }
 }
 
-static bool
-check_socket_frontend (void)
-{
-    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
-
-    SocketAddress address;
-    SocketClient client;
-
-    uint32 magic;
-
-    address.set_address (scim_get_default_socket_frontend_address ());
-
-    if (!client.connect (address))
-        return false;
-
-    if (!scim_socket_open_connection (magic,
-                                      String ("ConnectionTester"),
-                                      String ("SocketFrontEnd"),
-                                      client,
-                                      1000)) {
-        return false;
-    }
-
-    return true;
-}
-
 void
 initialize (void)
 {
@@ -2902,6 +3096,7 @@ initialize (void)
     bool                    manual = false;
     bool                    socket = true;
     String                  config_module_name = "simple";
+    int                     ret    = -1;
 
     LOGD ("Initializing Ecore ISF IMModule...\n");
 
@@ -2912,8 +3107,14 @@ initialize (void)
         // If no Socket FrontEnd is running, then launch one.
         // And set manual to false.
         bool check_result = check_socket_frontend ();
+
+        /* Make sure we are not retrying for more than 10 seconds */
+        for (int i = 0; i < 100 && !check_result; ++i) {
+            check_result = check_socket_frontend ();
+            scim_usleep (100000);
+        }
+
         if (!check_result) {
-            std::cerr << "Launching a ISF daemon with Socket FrontEnd...\n";
             //get modules list
             scim_get_imengine_module_list (engine_list);
             scim_get_helper_module_list (helper_list);
@@ -2924,12 +3125,8 @@ initialize (void)
             }
             for (it = helper_list.begin (); it != helper_list.end (); it++)
                 load_engine_list.push_back (*it);
-            const char *new_argv [] = { "--no-stay", 0 };
-            scim_launch (true,
-                         config_module_name,
-                         (load_engine_list.size () > 0 ? scim_combine_string_list (load_engine_list, ',') : "none"),
-                         "socket",
-                         (char **)new_argv);
+
+            launch_socket_frontend ();
             manual = false;
         }
 
@@ -2954,7 +3151,7 @@ initialize (void)
     }
 
     if (_config.null ()) {
-        LOGD ("Config module cannot be loaded, using dummy Config.\n");
+        LOGW ("Config module cannot be loaded, using dummy Config.\n");
         _config = new DummyConfig ();
         config_module_name = "dummy";
     }
@@ -2978,6 +3175,13 @@ initialize (void)
     _fallback_instance = _fallback_factory->create_instance (String ("UTF-8"), 0);
     _fallback_instance->signal_connect_commit_string (slot (fallback_commit_string_cb));
 
+    /* get the input window */
+    Ecore_X_Atom atom = ecore_x_atom_get (E_PROP_DEVICEMGR_INPUTWIN);
+    ret = ecore_x_window_prop_xid_get (ecore_x_window_root_first_get (), atom, ECORE_X_ATOM_WINDOW, &_input_win, 1);
+    if (_input_win == 0 || ret < 1)
+    {
+        LOGW ("Input window is NULL!\n");
+    }
     // Attach Panel Client signal.
     _panel_client.signal_connect_reload_config                 (slot (panel_slot_reload_config));
     _panel_client.signal_connect_exit                          (slot (panel_slot_exit));
@@ -3004,6 +3208,8 @@ initialize (void)
     _panel_client.signal_connect_update_preedit_string         (slot (panel_slot_update_preedit_string));
     _panel_client.signal_connect_get_surrounding_text          (slot (panel_slot_get_surrounding_text));
     _panel_client.signal_connect_delete_surrounding_text       (slot (panel_slot_delete_surrounding_text));
+    _panel_client.signal_connect_get_selection                 (slot (panel_slot_get_selection));
+    _panel_client.signal_connect_set_selection                 (slot (panel_slot_set_selection));
     _panel_client.signal_connect_update_displayed_candidate_number (slot (panel_slot_update_displayed_candidate_number));
     _panel_client.signal_connect_candidate_more_window_show    (slot (panel_slot_candidate_more_window_show));
     _panel_client.signal_connect_candidate_more_window_hide    (slot (panel_slot_candidate_more_window_hide));
@@ -3055,31 +3261,6 @@ finalize (void)
 }
 
 static void
-_popup_message (const char *_ptext)
-{
-    if (_ptext == NULL)
-        return;
-
-    notification_status_message_post(_ptext);
-}
-
-static void
-_display_input_language (EcoreIMFContextISF *ic)
-{
-    IMEngineFactoryPointer sf;
-
-    if (ic && ic->impl) {
-        if (ic->impl->is_on) {
-            sf = _backend->get_factory (ic->impl->si->get_factory_uuid ());
-            _popup_message (scim_get_language_name (sf->get_language ()).c_str ());
-        }
-        else {
-            _popup_message (scim_get_language_name ("en").c_str());
-        }
-    }
-}
-
-static void
 open_next_factory (EcoreIMFContextISF *ic)
 {
     if (!check_valid_ic (ic))
@@ -3105,7 +3286,6 @@ open_next_factory (EcoreIMFContextISF *ic)
             _default_instance = ic->impl->si;
             ic->impl->shared_si = true;
         }
-        _popup_message (utf8_wcstombs (sf->get_name ()).c_str ());
     }
 }
 
@@ -3135,7 +3315,6 @@ open_previous_factory (EcoreIMFContextISF *ic)
             _default_instance = ic->impl->si;
             ic->impl->shared_si = true;
         }
-        _popup_message (utf8_wcstombs (sf->get_name ()).c_str ());
     }
 }
 
@@ -3174,7 +3353,7 @@ open_specific_factory (EcoreIMFContextISF *ic,
         }
     } else {
         std::cerr << "open_specific_factory () is failed!!!!!!\n";
-        LOGE ("open_specific_factory () is failed. ic : %x uuid : %s", ic->id, uuid.c_str ());
+        LOGW ("open_specific_factory () is failed. ic : %x uuid : %s", ic->id, uuid.c_str ());
 
         // turn_off_ic comment out panel_req_update_factory_info ()
         //turn_off_ic (ic);
@@ -3343,7 +3522,7 @@ static XKeyEvent createKeyEvent (bool press, int keycode, int modifiers, bool fa
     if (fake)
         event.time    = 0;
     else
-        event.time    = get_time ();
+        event.time    = 1;
 
     event.x           = 1;
     event.y           = 1;
@@ -3378,13 +3557,14 @@ static void send_x_key_event (const KeyEvent &key, bool fake)
     Display *display = (Display *)ecore_x_display_get ();
     if (display == NULL) {
         std::cerr << "ecore_x_display_get () failed\n";
+        LOGW ("ecore_x_display_get () failed\n");
         return;
     }
 
     // Check focus window
     XGetInputFocus (display, &focus_win, &revert);
     if (focus_win == None) {
-        LOGE ("Input focus window is None\n");
+        LOGW ("Input focus window is None\n");
         return;
     }
 
@@ -3402,8 +3582,10 @@ static void send_x_key_event (const KeyEvent &key, bool fake)
 
     // get x keysym, keycode, keyname, and key
     keysym = XStringToKeysym (keysym_str);
-    if (keysym == NoSymbol)
+    if (keysym == NoSymbol) {
+        SECURE_LOGW ("NoSymbol\n");
         return;
+    }
 
     keycode = _keyname_to_keycode (keysym_str);
     if (XkbKeycodeToKeysym (display, keycode, 0, 0) != keysym) {
@@ -3518,6 +3700,12 @@ attach_instance (const IMEngineInstancePointer &si)
     si->signal_connect_delete_surrounding_text (
         slot (slot_delete_surrounding_text));
 
+    si->signal_connect_get_selection (
+        slot (slot_get_selection));
+
+    si->signal_connect_set_selection (
+        slot (slot_set_selection));
+
     si->signal_connect_expand_candidate (
         slot (slot_expand_candidate));
     si->signal_connect_contract_candidate (
@@ -3721,7 +3909,7 @@ slot_commit_string (IMEngineInstanceBase *si,
             if (ecore_imf_context_input_panel_layout_get (ic->ctx) == ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL &&
                 ic->impl->shift_mode_enabled &&
                 ic->impl->autocapital_type != ECORE_IMF_AUTOCAPITAL_TYPE_NONE &&
-                hw_keyboard_num_get () == 0) {
+                get_hardware_keyboard_mode () == EINA_FALSE) {
                 char converted[2] = {'\0'};
                 if (utf8_wcstombs (str).length () == 1) {
                     Eina_Bool uppercase;
@@ -3943,6 +4131,55 @@ slot_delete_surrounding_text (IMEngineInstanceBase *si,
     return false;
 }
 
+static bool
+slot_get_selection (IMEngineInstanceBase *si,
+                           WideString            &text)
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+#ifdef _WEARABLE
+    EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *> (si->get_frontend_data ());
+
+    if (ic && ic->impl && _focused_ic == ic) {
+        char *selection = NULL;
+        if (ecore_imf_context_selection_get (_focused_ic->ctx, &selection)) {
+            SCIM_DEBUG_FRONTEND(2) << "Selection: " << selection <<"\n";
+
+            if (!selection)
+                return false;
+
+            text = utf8_mbstowcs (String (selection));
+            free (selection);
+            selection = NULL;
+            return true;
+        }
+    }
+#endif
+    return false;
+}
+
+static bool
+slot_set_selection (IMEngineInstanceBase *si,
+                              int              start,
+                              int              end)
+{
+    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
+
+#ifdef _WEARABLE
+    EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *> (si->get_frontend_data ());
+
+    if (ic && ic->impl && _focused_ic == ic) {
+        Ecore_IMF_Event_Selection ev;
+        ev.ctx = _focused_ic->ctx;
+        ev.start = start;
+        ev.end = end;
+        ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_SELECTION_SET, &ev);
+        return true;
+    }
+#endif
+    return false;
+}
+
 static void
 slot_expand_candidate (IMEngineInstanceBase *si)
 {
index 66f4cf6..3be25ce 100644 (file)
@@ -29,6 +29,9 @@
 #include <Ecore_IMF.h>
 #include <dlog.h>
 
+#ifdef LOG_TAG
+# undef LOG_TAG
+#endif
 #define LOG_TAG "IMMODULE"
 
 const double DOUBLE_SPACE_INTERVAL = 1.0;
index 6ca2319..3fee08b 100644 (file)
@@ -44,9 +44,9 @@ static bool               IfInitContext     = false;
 static Ecore_IMF_Context *show_req_ic       = NULL;
 static Ecore_IMF_Context *hide_req_ic       = NULL;
 static Ecore_Event_Handler *_prop_change_handler = NULL;
-static Ecore_X_Atom       prop_x_ext_keyboard_exist = 0;
-static Ecore_X_Window     _rootwin;
-static unsigned int       hw_kbd_num = 0;
+static Ecore_X_Atom       prop_x_keyboard_input_detected = 0;
+static Ecore_X_Window     _control_win;
+static Eina_Bool          hw_kbd_mode = EINA_FALSE;
 static Ecore_Timer       *hide_timer = NULL;
 static Ecore_Timer       *will_show_timer = NULL;
 Ecore_IMF_Input_Panel_State input_panel_state = ECORE_IMF_INPUT_PANEL_STATE_HIDE;
@@ -120,6 +120,25 @@ static Eina_Bool _conformant_get ()
     return ecore_x_e_illume_conformant_get (active_context_window);
 }
 
+static Ecore_X_Window _client_window_id_get (Ecore_IMF_Context *ctx)
+{
+    Ecore_X_Window xid = 0;
+    Evas *evas = NULL;
+    Ecore_Evas *ee = NULL;
+
+    evas = (Evas *)ecore_imf_context_client_canvas_get (ctx);
+
+    if (evas) {
+        ee = ecore_evas_ecore_evas_get (evas);
+        if (ee)
+            xid = (Ecore_X_Window)ecore_evas_window_get (ee);
+    } else {
+        xid = (Ecore_X_Window)ecore_imf_context_client_window_get (ctx);
+    }
+
+    return xid;
+}
+
 static Eina_Bool _prop_change (void *data, int ev_type, void *ev)
 {
     Ecore_X_Event_Window_Property *event = (Ecore_X_Event_Window_Property *)ev;
@@ -127,67 +146,47 @@ static Eina_Bool _prop_change (void *data, int ev_type, void *ev)
     int sx = -1, sy = -1, sw = -1, sh = -1;
 
     if (event->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) {
-        Ecore_X_Virtual_Keyboard_State state = ecore_x_e_virtual_keyboard_state_get (event->win);
+        if (event->win == active_context_window) {
+            Ecore_X_Virtual_Keyboard_State state = ecore_x_e_virtual_keyboard_state_get (event->win);
 
-        if (!ecore_x_e_illume_keyboard_geometry_get (event->win, &sx, &sy, &sw, &sh))
-            sx = sy = sw = sh = 0;
+            if (!ecore_x_e_illume_keyboard_geometry_get (event->win, &sx, &sy, &sw, &sh))
+                sx = sy = sw = sh = 0;
 
-        if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) {
-            LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _render_post_cb\n");
-            conformant_reset_done = EINA_FALSE;
-            candidate_conformant_reset_done = EINA_FALSE;
-            if (active_context_canvas && _conformant_get ()) {
-                evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _render_post_cb, NULL);
-            }
+            if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) {
+                LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _render_post_cb\n");
+                conformant_reset_done = EINA_FALSE;
+                candidate_conformant_reset_done = EINA_FALSE;
+                if (active_context_canvas && _conformant_get ()) {
+                    evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _render_post_cb, NULL);
+                }
 
-            LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh);
-        }
-        else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) {
-            LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _candidate_render_post_cb\n");
-            conformant_reset_done = EINA_FALSE;
-            candidate_conformant_reset_done = EINA_FALSE;
-            if (active_context_canvas && _conformant_get ()) {
-                evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _candidate_render_post_cb, NULL);
+                LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh);
+            }
+            else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) {
+                LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _candidate_render_post_cb\n");
+                conformant_reset_done = EINA_FALSE;
+                candidate_conformant_reset_done = EINA_FALSE;
+                if (active_context_canvas && _conformant_get ()) {
+                    evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _candidate_render_post_cb, NULL);
+                }
+                LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_ON] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh);
             }
-            LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_ON] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh);
         }
     } else {
-        if (event->win != _rootwin) return ECORE_CALLBACK_PASS_ON;
-        if (event->atom != prop_x_ext_keyboard_exist) return ECORE_CALLBACK_PASS_ON;
-        if (!ecore_x_window_prop_card32_get (event->win, prop_x_ext_keyboard_exist, &val, 1) > 0)
+        if (event->win != _control_win) return ECORE_CALLBACK_PASS_ON;
+        if (event->atom != prop_x_keyboard_input_detected) return ECORE_CALLBACK_PASS_ON;
+        if (ecore_x_window_prop_card32_get (event->win, prop_x_keyboard_input_detected, &val, 1) <= 0)
             return ECORE_CALLBACK_PASS_ON;
 
-        if (val != 0) {
-            if (show_req_ic)
-                ecore_imf_context_input_panel_hide (show_req_ic);
+        if (val == 0) {
+            hw_kbd_mode = EINA_FALSE;
+            LOGD ("H/W keyboard mode : %d\n", hw_kbd_mode);
         }
-
-        hw_kbd_num = val;
-        LOGD ("The number of connected H/W keyboard : %d\n", hw_kbd_num);
     }
 
     return ECORE_CALLBACK_PASS_ON;
 }
 
-static Ecore_X_Window _client_window_id_get (Ecore_IMF_Context *ctx)
-{
-    Ecore_X_Window xid = 0;
-    Evas *evas = NULL;
-    Ecore_Evas *ee = NULL;
-
-    evas = (Evas *)ecore_imf_context_client_canvas_get (ctx);
-
-    if (evas) {
-        ee = ecore_evas_ecore_evas_get (evas);
-        if (ee)
-            xid = (Ecore_X_Window)ecore_evas_window_get (ee);
-    } else {
-        xid = (Ecore_X_Window)ecore_imf_context_client_window_get (ctx);
-    }
-
-    return xid;
-}
-
 void save_current_xid (Ecore_IMF_Context *ctx)
 {
     Ecore_X_Window xid = 0, rootwin_xid = 0;
@@ -223,7 +222,7 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value)
         case ECORE_IMF_INPUT_PANEL_STATE_EVENT:
             switch (value) {
                 case ECORE_IMF_INPUT_PANEL_STATE_HIDE:
-                    LOGD ("[input panel has been hidden] ctx : %p\n", using_ic);
+                    SECURE_LOGD ("[input panel has been hidden] ctx : %p\n", using_ic);
                     if (hide_req_ic == show_req_ic)
                         show_req_ic = NULL;
 
@@ -231,28 +230,28 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value)
                     will_hide = EINA_FALSE;
                     break;
                 case ECORE_IMF_INPUT_PANEL_STATE_SHOW:
-                    LOGD ("[input panel has been shown] ctx : %p\n", using_ic);
+                    SECURE_LOGD ("[input panel has been shown] ctx : %p\n", using_ic);
                     break;
                 case ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW:
-                    LOGD ("[input panel will be shown] ctx : %p\n", using_ic);
+                    SECURE_LOGD ("[input panel will be shown] ctx : %p\n", using_ic);
                     break;
             }
             notified_state = (Ecore_IMF_Input_Panel_State)value;
             break;
         case ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT:
-            LOGD ("[language is changed] ctx : %p\n", using_ic);
+            SECURE_LOGD ("[language is changed] ctx : %p\n", using_ic);
             break;
         case ECORE_IMF_INPUT_PANEL_SHIFT_MODE_EVENT:
-            LOGD ("[shift mode is changed] ctx : %p\n", using_ic);
+            SECURE_LOGD ("[shift mode is changed] ctx : %p\n", using_ic);
             break;
         case ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT:
-            LOGD ("[input panel geometry is changed] ctx : %p\n", using_ic);
+            SECURE_LOGD ("[input panel geometry is changed] ctx : %p\n", using_ic);
             break;
         case ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT:
-            LOGD ("[candidate state is changed] ctx : %p, %d\n", using_ic, value);
+            SECURE_LOGD ("[candidate state is changed] ctx : %p, %d\n", using_ic, value);
             break;
         case ECORE_IMF_CANDIDATE_PANEL_GEOMETRY_EVENT:
-            LOGD ("[candidate geometry is changed] ctx : %p\n", using_ic);
+            SECURE_LOGD ("[candidate geometry is changed] ctx : %p\n", using_ic);
             break;
         default:
             break;
@@ -321,7 +320,7 @@ static void _send_input_panel_hide_request ()
 
     _win_focus_out_handler_del ();
 
-    LOGD ("Send input panel hide request\n");
+    SECURE_LOGD ("Send input panel hide request\n");
 
     _isf_imf_context_input_panel_hide (get_panel_client_id (), hide_context_id);
     hide_context_id = -1;
@@ -337,7 +336,7 @@ static Eina_Bool _hide_timer_handler (void *data)
 
 static Eina_Bool _will_show_timer_handler (void *data)
 {
-    LOGD ("reset input panel state as HIDE\n");
+    SECURE_LOGD ("reset input panel state as HIDE\n");
 
     input_panel_state = ECORE_IMF_INPUT_PANEL_STATE_HIDE;
     will_show_timer = NULL;
@@ -390,11 +389,19 @@ static Eina_Bool _client_window_focus_out_cb (void *data, int ev_type, void *ev)
 {
     Ecore_X_Event_Window_Focus_Out *e = (Ecore_X_Event_Window_Focus_Out *)ev;
     Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)data;
-
     if (!ctx || !e) return ECORE_CALLBACK_PASS_ON;
-    if (e->win != (Ecore_X_Window)ecore_imf_context_client_window_get (ctx)) return ECORE_CALLBACK_PASS_ON;
+    Ecore_X_Window client_win = _client_window_id_get (ctx);
 
-    isf_imf_context_input_panel_instant_hide (ctx);
+    LOGD ("ctx : %p, client_window : %d\n", ctx, client_win);
+
+    if (client_win > 0) {
+        if (e->win == client_win)
+            isf_imf_context_input_panel_instant_hide (ctx);
+    }
+    else {
+        _clear_hide_timer ();
+        _send_input_panel_hide_request ();
+    }
 
     return ECORE_CALLBACK_PASS_ON;
 }
@@ -404,9 +411,9 @@ void input_panel_event_callback_call (Ecore_IMF_Input_Panel_Event type, int valu
     _event_callback_call (type, value);
 }
 
-int hw_keyboard_num_get ()
+Eina_Bool get_hardware_keyboard_mode ()
 {
-    return hw_kbd_num;
+    return hw_kbd_mode;
 }
 
 void isf_imf_context_control_panel_show (Ecore_IMF_Context *ctx)
@@ -427,22 +434,28 @@ void isf_imf_context_control_panel_hide (Ecore_IMF_Context *ctx)
 
 void isf_imf_input_panel_init (void)
 {
+    unsigned int val = 0;
     if (_prop_change_handler) return;
 
-    _rootwin = ecore_x_window_root_first_get ();
-    ecore_x_event_mask_set (_rootwin, ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
+    Ecore_X_Atom atom = ecore_x_atom_get ("_ISF_CONTROL_WINDOW");
+    ecore_x_window_prop_xid_get (ecore_x_window_root_first_get (), atom, ECORE_X_ATOM_WINDOW, &_control_win, 1);
+    ecore_x_event_mask_set (_control_win, ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
 
     _prop_change_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, NULL);
 
-    if (!prop_x_ext_keyboard_exist)
-        prop_x_ext_keyboard_exist = ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST);
+    if (!prop_x_keyboard_input_detected)
+        prop_x_keyboard_input_detected = ecore_x_atom_get (PROP_X_EXT_KEYBOARD_INPUT_DETECTED);
 
-    if (!ecore_x_window_prop_card32_get (_rootwin, prop_x_ext_keyboard_exist, &hw_kbd_num, 1)) {
-        LOGW ("Error! cannot get hw_kbd_num\n");
-        return;
+    if (ecore_x_window_prop_card32_get (_control_win, prop_x_keyboard_input_detected, &val, 1) > 0){
+        if (val == 1){
+            hw_kbd_mode = EINA_TRUE;
+        } else {
+            hw_kbd_mode = EINA_FALSE;
+        }
+    } else {
+        hw_kbd_mode = EINA_FALSE;
     }
-
-    LOGD ("The number of connected H/W keyboard : %d\n", hw_kbd_num);
+    LOGD ("H/W keyboard mode : %d\n", hw_kbd_mode);
 }
 
 void isf_imf_input_panel_shutdown (void)
@@ -484,12 +497,8 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx)
         _isf_imf_context_init ();
     }
 
-    /* for X based application not to use evas */
-    if (ecore_imf_context_client_canvas_get (ctx) == NULL) {
-        _win_focus_out_handler_del ();
-
-        _win_focus_out_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_FOCUS_OUT, _client_window_focus_out_cb, ctx);
-    }
+    _win_focus_out_handler_del ();
+    _win_focus_out_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_FOCUS_OUT, _client_window_focus_out_cb, ctx);
 
     /* set password mode */
     iseContext.password_mode = !!(ecore_imf_context_input_mode_get (ctx) & ECORE_IMF_INPUT_MODE_INVISIBLE);
@@ -527,7 +536,7 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx)
         return;
     }
 
-    if (hw_kbd_num != 0) {
+    if (hw_kbd_mode) {
         LOGD ("H/W keyboard is existed.\n");
         return;
     }
@@ -538,11 +547,13 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx)
 
     if ((show_req_ic == ctx) &&
         (_compare_context (show_req_ic, ctx) == EINA_TRUE) &&
-        (input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW ||
-         input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) &&
         (!will_hide)) {
-        LOGD ("already show\n");
-        return;
+        Ecore_IMF_Input_Panel_State state = ecore_imf_context_input_panel_state_get (ctx);
+        if (state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW ||
+            state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
+            LOGD ("already show\n");
+            return;
+        }
     }
 
     will_hide = EINA_FALSE;
@@ -568,10 +579,14 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx)
 
     iseContext.autocapital_type = ecore_imf_context_autocapital_type_get (ctx);
 
-    LOGD ("ctx : %p, layout : %d, layout variation : %d\n", ctx, iseContext.layout, iseContext.layout_variation);
-    LOGD ("language : %d, cursor position : %d, caps mode : %d\n", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode);
-    LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d\n", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
-    LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d\n", iseContext.client_window, iseContext.password_mode, iseContext.prediction_allow);
+    SECURE_LOGD ("ctx : %p, layout : %d, layout variation : %d\n", ctx, iseContext.layout, iseContext.layout_variation);
+    SECURE_LOGD ("language : %d, cursor position : %d, caps mode : %d\n", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode);
+    SECURE_LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d\n", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
+    SECURE_LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d\n", iseContext.client_window, iseContext.password_mode, iseContext.prediction_allow);
+
+    if (iseContext.client_window != ecore_x_window_focus_get ()) {
+        LOGW ("Client window is different from focus window. client win : %#x, focus win : %#x\n", iseContext.client_window, ecore_x_window_focus_get ());
+    }
 
     /* calculate packet size */
     length = sizeof (iseContext);
@@ -607,7 +622,7 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx)
 
 void isf_imf_context_input_panel_hide (Ecore_IMF_Context *ctx)
 {
-    LOGD ("ctx : %p\n", ctx);
+    SECURE_LOGD ("ctx : %p\n", ctx);
 
     if (get_desktop_mode ())
         return;
@@ -632,7 +647,7 @@ void isf_imf_context_input_panel_language_set (Ecore_IMF_Context *ctx, Ecore_IMF
     iseContext.language = language;
 
     if (context_scim == get_focused_ic ()) {
-        LOGD ("language mode : %d\n", language);
+        SECURE_LOGD ("language mode : %d\n", language);
         _isf_imf_context_input_panel_language_set (_get_context_id (ctx), language);
     }
 }
@@ -657,7 +672,7 @@ void isf_imf_context_input_panel_caps_mode_set (Ecore_IMF_Context *ctx, unsigned
 {
     if (!IfInitContext)
         _isf_imf_context_init ();
-    LOGD ("ctx : %p, mode : %d\n", ctx, mode);
+    SECURE_LOGD ("ctx : %p, mode : %d\n", ctx, mode);
     _isf_imf_context_input_panel_caps_mode_set (_get_context_id (ctx), mode);
 }
 
@@ -717,7 +732,7 @@ void isf_imf_context_input_panel_geometry_get (Ecore_IMF_Context *ctx, int *x, i
         _isf_imf_context_init ();
     _isf_imf_context_input_panel_geometry_get (_get_context_id (ctx), x, y, w, h);
 
-    LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h);
+    SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h);
 }
 
 /**
@@ -734,7 +749,7 @@ void isf_imf_context_input_panel_return_key_type_set (Ecore_IMF_Context *ctx, Ec
         _isf_imf_context_init ();
 
     if (context_scim == get_focused_ic ()) {
-        LOGD ("Return key type : %d\n", type);
+        SECURE_LOGD ("Return key type : %d\n", type);
         _isf_imf_context_input_panel_return_key_type_set (_get_context_id (ctx), type);
     }
 }
@@ -774,7 +789,7 @@ void isf_imf_context_input_panel_return_key_disabled_set (Ecore_IMF_Context *ctx
         _isf_imf_context_init ();
 
     if (context_scim == get_focused_ic ()) {
-        LOGD ("Return key disabled : %d\n", disabled);
+        SECURE_LOGD ("Return key disabled : %d\n", disabled);
         _isf_imf_context_input_panel_return_key_disabled_set (_get_context_id (ctx), disabled);
     }
 }
@@ -815,7 +830,7 @@ isf_imf_context_input_panel_layout_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_
         _isf_imf_context_init ();
 
     if (context_scim == get_focused_ic ()) {
-        LOGD ("layout type : %d\n", layout);
+        SECURE_LOGD ("layout type : %d\n", layout);
         _isf_imf_context_input_panel_layout_set (_get_context_id (ctx), layout);
         imengine_layout_set (ctx, layout);
     }
@@ -883,7 +898,7 @@ void isf_imf_context_candidate_window_geometry_get (Ecore_IMF_Context *ctx, int
         _isf_imf_context_init ();
     _isf_imf_context_candidate_window_geometry_get (_get_context_id (ctx), x, y, w, h);
 
-    LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h);
+    SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h);
 }
 
 void isf_imf_context_input_panel_send_will_show_ack (Ecore_IMF_Context *ctx)
@@ -922,8 +937,8 @@ void isf_imf_context_set_hardware_keyboard_mode (Ecore_IMF_Context *ctx)
         _isf_imf_context_init ();
     }
 
-    hw_kbd_num = 1;
-    SECURE_LOGD ("The number of connected H/W keyboard : %d\n", hw_kbd_num);
+    hw_kbd_mode = EINA_TRUE;
+    SECURE_LOGD ("H/W keyboard mode : %d\n", hw_kbd_mode);
     _isf_imf_context_set_hardware_keyboard_mode (_get_context_id (ctx));
 }
 
index 8125605..bff46c5 100644 (file)
@@ -32,7 +32,7 @@ extern "C"
 {
 #endif /* __cplusplus */
     void input_panel_event_callback_call (Ecore_IMF_Input_Panel_Event type, int value);
-    int  hw_keyboard_num_get ();
+    Eina_Bool get_hardware_keyboard_mode ();
     bool process_update_input_context (int type, int value);
     Ecore_IMF_Context *get_using_ic (Ecore_IMF_Input_Panel_Event type, int value);
     void save_current_xid (Ecore_IMF_Context *ctx);
index c7527cb..a39d605 100644 (file)
@@ -98,7 +98,7 @@ extern "C"
 
         ctxd = isf_imf_context_new ();
         if (!ctxd) {
-            LOGE ("isf_imf_context_new () failed!!!\n");
+            LOGW ("isf_imf_context_new () failed!!!\n");
             return NULL;
         }
 
index bc3c0cc..4625af6 100644 (file)
@@ -26,15 +26,27 @@ endif
 bin_PROGRAMS           = $(CONFIG_SCIM_PANEL_EFL)
 
 isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
-                         isf_panel_utility.cpp
+                         isf_panel_utility.cpp \
+                         center_popup.cpp
 
-isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ @VCONF_CFLAGS@ @DLOG_CFLAGS@ @TTS_CFLAGS@ @FEEDBACK_CFLAGS@
+if ISF_BUILD_MINICONTROL
+isf_panel_efl_SOURCES  += minicontrol.cpp
+endif
+
+isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ @EFL_ASSIST_CFLAGS@ @VCONF_CFLAGS@ @X11_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@ @DLOG_CFLAGS@ \
+                         @MINICONTROL_PROVIDER_CFLAGS@ @NOTIFICATION_CFLAGS@ @TTS_CFLAGS@ @EDBUS_CFLAGS@ @BLUETOOTH_CFLAGS@ @FEEDBACK_CFLAGS@
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
+                         @EFL_ASSIST_LIBS@ \
                          @VCONF_LIBS@ \
                          @X11_LIBS@ \
+                         @PRIVILEGE_CONTROL_LIBS@ \
                          @DLOG_LIBS@ \
+                         @MINICONTROL_PROVIDER_LIBS@ \
+                         @NOTIFICATION_LIBS@ \
                          @TTS_LIBS@ \
+                         @EDBUS_LIBS@ \
+                         @BLUETOOTH_LIBS@ \
                          @FEEDBACK_LIBS@
 
 isf_panel_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
diff --git a/ism/extras/efl_panel/center_popup.cpp b/ism/extras/efl_panel/center_popup.cpp
new file mode 100644 (file)
index 0000000..602fb3c
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+ * ISF(Input Service Framework)
+ *
+ * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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 "center_popup.h"
+
+#include <Ecore_X.h>
+#define BASE_WIDTH      (720 * elm_config_scale_get())
+#define BASE_HEIGHT     (1280 * elm_config_scale_get())
+
+typedef struct _Center_Popup_Data Center_Popup_Data;
+struct _Center_Popup_Data
+{
+   Evas_Object *parent;
+   Evas_Object *parent_win;
+   Evas_Object *block_events;
+   Evas_Object *popup_win;
+};
+
+static void _center_popup_resize_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
+{
+    Center_Popup_Data *cp_data = (Center_Popup_Data *)data;
+    if (!cp_data) return;
+
+    Evas_Coord ox, oy, ow, oh;
+    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
+    evas_object_resize(cp_data->popup_win, ow, oh);
+}
+
+static void _center_popup_parent_del_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
+{
+    Evas_Object *object = (Evas_Object *)data;
+    evas_object_del(object);
+}
+
+static void
+_block_area_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+    evas_object_smart_callback_call((Evas_Object *)data, "block,clicked", NULL);
+}
+
+static void _popup_win_del_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
+{
+    Evas_Object *popup = (Evas_Object *)data;
+    elm_win_resize_object_del(obj, popup);
+}
+
+static void _center_popup_del_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
+{
+    Center_Popup_Data *cp_data = (Center_Popup_Data *)data;
+    if (!cp_data) return;
+
+    elm_layout_signal_callback_del(cp_data->block_events, "elm,action,click", "elm", _block_area_clicked_cb);
+    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE, _center_popup_resize_cb, cp_data);
+    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _center_popup_del_cb, cp_data);
+    if (cp_data->parent)
+        evas_object_event_callback_del_full(cp_data->parent, EVAS_CALLBACK_DEL, _center_popup_parent_del_cb, obj);
+
+    elm_win_resize_object_del(cp_data->popup_win, cp_data->block_events);
+    evas_object_del(cp_data->block_events);
+    evas_object_del(cp_data->popup_win);
+    free(cp_data);
+}
+
+Evas_Object *
+center_popup_win_get(Evas_Object *popup)
+{
+    return evas_object_top_get(evas_object_evas_get(popup));
+}
+
+Evas_Object *
+center_popup_add(Evas_Object *parent, const char *name, const char *title)
+{
+    Center_Popup_Data *cp_data;
+    Evas_Object *popup;
+
+    cp_data = (Center_Popup_Data *)calloc(1, sizeof(Center_Popup_Data));
+    cp_data->parent = parent;
+    if (parent)
+        cp_data->parent_win = evas_object_top_get(evas_object_evas_get(parent));
+    else
+        cp_data->parent_win = NULL;
+
+    // Create popup window
+    cp_data->popup_win = elm_win_add(cp_data->parent_win, name, ELM_WIN_DIALOG_BASIC);
+    if (!cp_data->popup_win) goto error;
+    elm_win_alpha_set(cp_data->popup_win, EINA_TRUE);
+    elm_win_title_set(cp_data->popup_win, title);
+    elm_win_conformant_set(cp_data->popup_win, EINA_TRUE);
+    elm_win_modal_set(cp_data->popup_win, EINA_TRUE);
+    elm_win_fullscreen_set(cp_data->popup_win, EINA_TRUE);
+    if (elm_win_wm_rotation_supported_get(cp_data->popup_win))
+    {
+        int rots[4] = { 0, 90, 180, 270 };
+        elm_win_wm_rotation_available_rotations_set(cp_data->popup_win, (const int*)(&rots), 4);
+    }
+    evas_object_show(cp_data->popup_win);
+
+    // Create Dimming object
+    cp_data->block_events = elm_layout_add(cp_data->popup_win);
+    elm_layout_theme_set(cp_data->block_events, "notify", "block_events", "popup");
+    evas_object_size_hint_weight_set(cp_data->block_events, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    elm_win_resize_object_add(cp_data->popup_win, cp_data->block_events);
+    evas_object_show(cp_data->block_events);
+    evas_object_repeat_events_set(cp_data->block_events, EINA_FALSE);
+
+    popup = elm_popup_add(cp_data->popup_win);
+    if (!popup) goto error;
+    elm_object_style_set(popup, "center_popup");
+
+    elm_popup_allow_events_set(popup, EINA_TRUE);
+    evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+    elm_layout_signal_callback_add(cp_data->block_events, "elm,action,click", "elm", _block_area_clicked_cb, popup);
+    evas_object_event_callback_priority_add(popup, EVAS_CALLBACK_DEL, EVAS_CALLBACK_PRIORITY_BEFORE, _center_popup_del_cb, cp_data);
+    if (parent)
+        evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, _center_popup_parent_del_cb, popup);
+    evas_object_event_callback_add(cp_data->popup_win, EVAS_CALLBACK_DEL, _popup_win_del_cb, popup);
+
+    return popup;
+
+error:
+    if (cp_data->block_events)
+    {
+        elm_win_resize_object_del(cp_data->popup_win, cp_data->block_events);
+        evas_object_del(cp_data->block_events);
+    }
+    if (cp_data->popup_win) evas_object_del(cp_data->popup_win);
+    free(cp_data);
+    return NULL;
+}
diff --git a/ism/extras/efl_panel/center_popup.h b/ism/extras/efl_panel/center_popup.h
new file mode 100644 (file)
index 0000000..feefed3
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * ISF(Input Service Framework)
+ *
+ * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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 __CENTER_POPUP_H__
+#define __CENTER_POPUP_H__
+
+#include <Elementary.h>
+
+Evas_Object *               center_popup_add(Evas_Object *parent, const char *name, const char *title);
+Evas_Object *               center_popup_win_get(Evas_Object *popup);
+
+#endif /* __CENTER_POPUP_H__ */
index ffb2c1d..857f084 100644 (file)
@@ -50,6 +50,8 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
+#include "center_popup.h"
+#include "minicontrol.h"
 #if HAVE_VCONF
 #include <vconf.h>
 #include <vconf-keys.h>
 #include <privilege-control.h>
 #include "isf_panel_utility.h"
 #include <dlog.h>
+#include <notification.h>
+#include <efl_assist.h>
 #if HAVE_TTS
 #include <tts.h>
 #endif
+#include <E_DBus.h>
 #if HAVE_FEEDBACK
 #include <feedback.h>
 #endif
+#if HAVE_BLUETOOTH
+#include <bluetooth.h>
+#endif
 
 using namespace scim;
 
@@ -82,16 +90,32 @@ using namespace scim;
 #define ISE_DEFAULT_HEIGHT_LANDSCAPE                    316
 
 #define ISF_SYSTEM_WM_READY_FILE                        "/tmp/.wm_ready"
-#define ISF_SYSTEM_APPSERVICE_READY_VCONF               "memory/appservice/status"
-#define ISF_SYSTEM_APPSERVICE_READY_STATE               1
 #define ISF_SYSTEM_WM_WAIT_COUNT                        200
 #define ISF_SYSTEM_WAIT_DELAY                           100 * 1000
 #define ISF_CANDIDATE_DESTROY_DELAY                     3
 
 #define ISF_PREEDIT_BORDER                              16
+#define ISE_LAUNCH_TIMEOUT                              2.0
+
+#define ISF_POP_PLAY_ICON_FILE                          "/usr/share/scim/icons/pop_play.png"
+#define ISF_KEYBOARD_ICON_FILE                          "keyboardicon.png"
+#define ISF_ISE_SELECTOR_ICON_FILE                      "noti_icon_keyboard_connected.png"
 
+#ifdef LOG_TAG
+# undef LOG_TAG
+#endif
 #define LOG_TAG                                         "ISF_PANEL_EFL"
 
+#define HOST_BUS_NAME        "org.tizen.usb.host"
+#define HOST_OBJECT_PATH     "/Org/Tizen/Usb/Host"
+#define HOST_INTERFACE_NAME  "org.tizen.usb.host"
+#define HOST_KEYBOARD_SIGNAL "usbkeyboard"
+#define HOST_ADDED           "added"
+#define HOST_REMOVED         "removed"
+
+#define E_PROP_DEVICEMGR_INPUTWIN                       "DeviceMgr Input Window"
+
+
 /////////////////////////////////////////////////////////////////////////////
 // Declaration of external variables.
 /////////////////////////////////////////////////////////////////////////////
@@ -118,6 +142,11 @@ typedef enum _WINDOW_STATE {
     WINDOW_STATE_ON,
 } WINDOW_STATE;
 
+typedef enum _KEYBOARD_MODE {
+    SOFTWARE_KEYBOARD_MODE = 0,
+    HARDWARE_KEYBOARD_MODE,
+} KEYBOARD_MODE;
+
 typedef std::map <String, Ecore_File_Monitor *>  OSPEmRepository;
 
 
@@ -126,8 +155,9 @@ typedef std::map <String, Ecore_File_Monitor *>  OSPEmRepository;
 /////////////////////////////////////////////////////////////////////////////
 static Evas_Object *efl_create_window                  (const char *strWinName, const char *strEffect);
 static void       efl_set_transient_for_app_window     (Ecore_X_Window window);
-static int        efl_get_angle_for_app_window         (void);
-static int        efl_get_angle_for_ise_window         (void);
+static int        efl_get_app_window_angle             (void);
+static int        efl_get_ise_window_angle             (void);
+static int        efl_get_quickpanel_window_angle      (void);
 
 static int        ui_candidate_get_valid_height        (void);
 static void       ui_candidate_hide                    (bool bForce, bool bSetVirtualKbd = true, bool will_hide = false);
@@ -137,9 +167,13 @@ static void       ui_candidate_show                    (bool bSetVirtualKbd = tr
 static void       ui_create_candidate_window           (void);
 static void       update_table                         (int table_type, const LookupTable &table);
 static void       ui_candidate_window_close_button_cb  (void *data, Evas *e, Evas_Object *button, void *event_info);
+static void       set_highlight_color                  (Evas_Object *item, uint32 nForeGround, uint32 nBackGround, bool bSetBack);
+static void       ui_tts_focus_rect_hide               (void);
+
+static Evas_Object *get_candidate                      (const String& str, Evas_Object *parent, int *total_width, uint32 ForeGround, uint32 BackGround, bool HighLight, bool SetBack, int item_num, int item);
+static bool       tokenize_tag                         (const String& str, struct image *image_data);
 
 static bool       check_wm_ready                       (void);
-static bool       check_system_ready                   (void);
 static void       launch_default_soft_keyboard         (keynode_t *key = NULL, void* data = NULL);
 
 /* PanelAgent related functions */
@@ -168,7 +202,7 @@ static void       slot_update_candidate_table          (const LookupTable &table
 static void       slot_select_candidate                (int index);
 static void       slot_set_active_ise                  (const String &uuid, bool changeDefault);
 static bool       slot_get_ise_list                    (std::vector<String> &list);
-static bool       slot_get_ise_information             (String uuid, String &name, String &language, int &type, int &option);
+static bool       slot_get_ise_information             (String uuid, String &name, String &language, int &type, int &option, String &module_name);
 static bool       slot_get_keyboard_ise_list           (std::vector<String> &name_list);
 static void       slot_get_language_list               (std::vector<String> &name);
 static void       slot_get_all_language                (std::vector<String> &lang);
@@ -189,13 +223,22 @@ static void       slot_hide_ise                        (void);
 static void       slot_will_hide_ack                   (void);
 static void       slot_candidate_will_hide_ack         (void);
 
+static void       slot_set_hardware_keyboard_mode      (void);
 static void       slot_get_ise_state                   (int &state);
 
 static Eina_Bool  panel_agent_handler                  (void *data, Ecore_Fd_Handler *fd_handler);
 
 static Eina_Bool  efl_create_control_window            (void);
 static Ecore_X_Window efl_get_app_window               (void);
-static void       _launch_default_soft_keyboard        (void);
+static Ecore_X_Window efl_get_quickpanel_window        (void);
+static void       check_hardware_keyboard              (KEYBOARD_MODE mode);
+static unsigned int get_ise_index                      (const String uuid);
+static bool       set_active_ise                       (const String &uuid);
+
+static void       minictrl_clicked_cb                  (void *data, Evas_Object *o, const char *emission, const char *source);
+#ifdef HAVE_MINICONTROL
+static void       ise_selector_minictrl_clicked_cb     (void *data, Evas_Object *o, const char *emission, const char *source);
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // Declaration of internal variables.
@@ -210,7 +253,9 @@ static Evas_Object       *_scroller_bg                      = 0;
 static Evas_Object       *_candidate_0_table                = 0;
 static Evas_Object       *_candidate_table                  = 0;
 static Evas_Object       *_candidate_0 [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
-static Evas_Object       *_candidate_items [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
+static Evas_Object       *_candidate_text [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
+static Evas_Object       *_candidate_image [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
+static Evas_Object       *_candidate_pop_image [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
 static Evas_Object       *_seperate_0 [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
 static Evas_Object       *_seperate_items [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
 static Evas_Object       *_line_0 [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
@@ -218,6 +263,7 @@ static Evas_Object       *_line_items [SCIM_LOOKUP_TABLE_MAX_PAGESIZE];
 static Evas_Object       *_more_btn                         = 0;
 static Evas_Object       *_close_btn                        = 0;
 static bool               _candidate_show_requested         = false;
+static bool               _updated_hide_state_geometry      = false;
 
 static int                _candidate_x                      = 0;
 static int                _candidate_y                      = 0;
@@ -259,6 +305,15 @@ static int                _candidate_scroll_width_max       = 663;
 static int                _candidate_scroll_height_min      = 124;
 static int                _candidate_scroll_height_max      = 190;
 
+const  int                MORE_BUTTON_INDEX                 = -1;
+const  int                CLOSE_BUTTON_INDEX                = -2;
+const  int                INVALID_TTS_FOCUS_INDEX           = -100;
+static int                _candidate_tts_focus_index        = INVALID_TTS_FOCUS_INDEX;
+static uint32             _candidate_display_number         = 0;
+static std::vector<uint32> _candidate_row_items;
+static Evas_Object       *_tts_focus_rect                   = 0;
+static bool               _wait_stop_event                  = false;
+
 static Evas_Object       *_preedit_window                   = 0;
 static Evas_Object       *_preedit_text                     = 0;
 static int                _preedit_width                    = 100;
@@ -276,12 +331,14 @@ static std::vector<Evas_Object *> _aux_seperates;
 static Evas_Object       *_tmp_preedit_text                 = 0;
 static Evas_Object       *_tmp_aux_text                     = 0;
 static Evas_Object       *_tmp_candidate_text               = 0;
+static Evas_Object       *_ise_selector                     = NULL;
+static Evas_Object       *_ise_selector_radio_grp           = NULL;
 
 static int                _spot_location_x                  = -1;
 static int                _spot_location_y                  = -1;
 static int                _spot_location_top_y              = -1;
 static int                _candidate_angle                  = 0;
-static int                _window_angle                     = -1;
+static int                _ise_angle                        = -1;
 
 static int                _ise_width                        = 0;
 static int                _ise_height                       = 0;
@@ -305,7 +362,6 @@ static int                _click_object                     = 0;
 static int                _click_down_pos [2]               = {0, 0};
 static int                _click_up_pos [2]                 = {0, 0};
 static bool               _is_click                         = true;
-static bool               _appsvc_callback_regist           = false;
 static String             _initial_ise_uuid                 = String ("");
 static ConfigPointer      _config;
 static PanelAgent        *_panel_agent                      = 0;
@@ -316,13 +372,14 @@ static clock_t            _clock_start;
 static Ecore_Timer       *_check_size_timer                 = NULL;
 static Ecore_Timer       *_longpress_timer                  = NULL;
 static Ecore_Timer       *_destroy_timer                    = NULL;
-static Ecore_Timer       *_system_ready_timer               = NULL;
 static Ecore_Timer       *_off_prepare_done_timer           = NULL;
 static Ecore_Timer       *_candidate_hide_timer             = NULL;
+static Ecore_Timer       *_ise_launch_timer                 = NULL;
 
 static Ecore_X_Window     _ise_window                       = 0;
 static Ecore_X_Window     _app_window                       = 0;
 static Ecore_X_Window     _control_window                   = 0;
+static Ecore_X_Window     _input_win                        = 0;
 
 static Ecore_File_Monitor *_inh_helper_ise_em               = NULL;
 static Ecore_File_Monitor *_inh_keyboard_ise_em             = NULL;
@@ -331,7 +388,23 @@ static Ecore_File_Monitor *_osp_keyboard_ise_em             = NULL;
 static OSPEmRepository     _osp_bin_em;
 static OSPEmRepository     _osp_info_em;
 
-static bool               hw_kbd_mode                       = false;
+static bool               candidate_expanded                = false;
+static int                _candidate_image_count            = 0;
+static int                _candidate_text_count             = 0;
+static int                _candidate_pop_image_count        = 0;
+static int                candidate_image_height            = 38;
+static int                candidate_play_image_width_height = 19;
+
+static const int          CANDIDATE_TEXT_OFFSET             = 2;
+static const unsigned int SELECT_IME_ITEM_HEIGHT            = 114;
+static const unsigned int MAX_SELECT_IME_ITEM               = 4;
+
+#ifdef HAVE_MINICONTROL
+static MiniControl        input_detect_minictrl;
+static MiniControl        ise_selector_minictrl;
+#endif
+
+static Elm_Genlist_Item_Class itc;
 
 #if HAVE_TTS
 static tts_h              _tts                              = NULL;
@@ -341,8 +414,26 @@ static tts_h              _tts                              = NULL;
 static bool               feedback_initialized              = false;
 #endif
 
+static E_DBus_Connection     *edbus_conn;
+static E_DBus_Signal_Handler *edbus_handler;
+
 static Ecore_Event_Handler *_candidate_show_handler         = NULL;
 
+enum {
+    EMOJI_IMAGE_WIDTH = 0,
+    EMOJI_IMAGE_HEIGHT,
+    EMOJI_IMAGE_KIND,
+    EMOJI_IMAGE_TAG_FLAG,
+    EMOJI_IMAGE_POP_FLAG,
+    EMOJI_IMAGE_END
+};
+
+struct image
+{
+    String path;
+    int emoji_option[EMOJI_IMAGE_END];
+};
+
 /* This structure stores the geometry information reported by ISE */
 struct GeometryCache
 {
@@ -352,6 +443,498 @@ struct GeometryCache
 };
 static struct GeometryCache _ise_reported_geometry          = {0};
 
+static void usb_keyboard_signal_cb (void *data, DBusMessage *msg)
+{
+    DBusError err;
+    char *str;
+
+    if (!msg) {
+        LOGW ("No Message");
+        return;
+    }
+
+    if (dbus_message_is_signal (msg, HOST_INTERFACE_NAME, HOST_KEYBOARD_SIGNAL) == 0) {
+        LOGW ("HOST_KEYBOARD_SIGNAL");
+        return;
+    }
+
+    dbus_error_init (&err);
+
+    if (dbus_message_get_args (msg, &err, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID) == 0) {
+        LOGW ("DBUS_TYPE_INVALID");
+        return;
+    }
+
+    if (!strncmp (str, HOST_ADDED, strlen (HOST_ADDED))) {
+        LOGD ("HOST_ADDED");
+        return;
+    }
+
+    if (!strncmp (str, HOST_REMOVED, strlen (HOST_REMOVED))) {
+        LOGD ("HOST_REMOVED");
+        minictrl_clicked_cb (NULL, NULL, NULL, NULL);
+        return;
+    }
+
+    LOGW ("ERROR: msg (%s) is improper", str);
+}
+
+static void unregister_edbus_signal_handler (void)
+{
+    if (edbus_conn) {
+        LOGD ("unregister signal handler for keyboard");
+        if (edbus_handler) {
+            e_dbus_signal_handler_del (edbus_conn, edbus_handler);
+            edbus_handler = NULL;
+        }
+        e_dbus_connection_close (edbus_conn);
+        edbus_conn = NULL;
+    }
+    e_dbus_shutdown ();
+}
+
+static int register_edbus_signal_handler (void)
+{
+    int retry;
+    LOGD ("start register_edbus_signal_handler");
+
+    retry = 0;
+    while (e_dbus_init () == 0) {
+        retry++;
+        if (retry >= 10) {
+            LOGW ("retry fail");
+            return -1;
+        }
+    }
+
+    edbus_conn = e_dbus_bus_get (DBUS_BUS_SYSTEM);
+    if (!edbus_conn) {
+        LOGW ("connection fail");
+        return -1;
+    }
+
+    edbus_handler = e_dbus_signal_handler_add (edbus_conn, NULL, HOST_OBJECT_PATH, HOST_INTERFACE_NAME, HOST_KEYBOARD_SIGNAL, usb_keyboard_signal_cb, NULL);
+    if (!edbus_handler) {
+        LOGW ("cannot register signal");
+        return -1;
+    }
+
+    LOGD ("Success register");
+
+    return 0;
+}
+
+static void minictrl_clicked_cb (void *data, Evas_Object *o, const char *emission, const char *source)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    unsigned int val = 0;
+#ifdef HAVE_MINICONTROL
+    input_detect_minictrl.destroy ();
+#endif
+
+    if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
+        ecore_x_window_prop_card32_set (_input_win, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1);
+    }
+}
+
+static void destroy_ise_selector ()
+{
+    if (_ise_selector_radio_grp) {
+         evas_object_del (_ise_selector_radio_grp);
+         _ise_selector_radio_grp = NULL;
+    }
+
+    if (_ise_selector) {
+        evas_object_del (_ise_selector);
+        _ise_selector = NULL;
+    }
+}
+
+static Eina_Bool delete_ise_launch_timer ()
+{
+    if (_ise_launch_timer) {
+        ecore_timer_del (_ise_launch_timer);
+        _ise_launch_timer = NULL;
+        return EINA_TRUE;
+    }
+    else
+        return EINA_FALSE;
+}
+
+static Eina_Bool ise_launch_timeout (void *data)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    LOGW ("ISE launching timeout\n");
+
+    destroy_ise_selector ();
+    return ECORE_CALLBACK_CANCEL;
+}
+
+static char *gl_ise_name_get (void *data, Evas_Object *obj, const char *part)
+{
+    int index = (int) data;
+    if (index < 0 || index >= (int)_names.size ())
+        return NULL;
+
+    return strdup (_names[index].c_str ());
+}
+
+static Evas_Object *gl_icon_get (void *data, Evas_Object *obj, const char *part)
+{
+    unsigned int index = (unsigned int)(data);
+
+    if (index >= _uuids.size ())
+        return NULL;
+
+    Evas_Object *radio = elm_radio_add (obj);
+    elm_radio_state_value_set (radio, index);
+    if (_ise_selector_radio_grp == NULL)
+        _ise_selector_radio_grp = elm_radio_add (obj);
+    elm_radio_group_add (radio, _ise_selector_radio_grp);
+    evas_object_show (radio);
+
+    if (get_ise_index (_panel_agent->get_current_helper_uuid ()) == index)
+        elm_radio_value_set (_ise_selector_radio_grp, index);
+
+    return radio;
+}
+
+static void gl_ise_selected_cb (void *data, Evas_Object *obj, void *event_info)
+{
+    int index = (int)(data);
+
+    if (index < 0 || index >= (int)_uuids.size ())
+        return;
+
+    if (_ise_selector_radio_grp)
+        elm_radio_value_set (_ise_selector_radio_grp, index);
+
+    if (TOOLBAR_HELPER_MODE == _panel_agent->get_current_toolbar_mode ()) {
+        if (_uuids[index] == _panel_agent->get_current_helper_uuid ()) {
+            destroy_ise_selector ();
+            return;
+        }
+    }
+
+    LOGD ("Set active ISE : %s\n", _uuids[index].c_str ());
+
+    set_active_ise (_uuids[index]);
+    _ise_launch_timer = ecore_timer_add (ISE_LAUNCH_TIMEOUT, ise_launch_timeout, NULL);
+}
+
+static void ise_selector_block_clicked_cb (void *data, Evas_Object *obj, void *event_info)
+{
+    destroy_ise_selector ();
+}
+
+static void ise_selector_popup_del_cb (void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+    LOGD ("IME Selector is deleted\n");
+
+    if (_ise_selector_radio_grp) {
+         evas_object_del (_ise_selector_radio_grp);
+         _ise_selector_radio_grp = NULL;
+    }
+
+    _ise_selector = NULL;
+}
+
+static void
+ise_selector_focus_out_cb (void *data, Evas *e, void *event_info)
+{
+    LOGD ("ISE selector window focus out\n");
+    destroy_ise_selector ();
+}
+
+#ifdef HAVE_MINICONTROL
+static void ise_selector_minictrl_clicked_cb (void *data, Evas_Object *o, const char *emission, const char *source)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    unsigned int index;
+    Evas_Object *genlist;
+    Evas_Object *box;
+    int height;
+    unsigned int item_count;
+
+    destroy_ise_selector ();
+
+    /* Create center popup */
+    _ise_selector = center_popup_add (NULL, "IMESelector", "IMESelector");
+    evas_object_event_callback_add (_ise_selector, EVAS_CALLBACK_DEL, ise_selector_popup_del_cb, NULL);
+    ea_object_event_callback_add (_ise_selector, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+    evas_object_smart_callback_add (_ise_selector, "block,clicked", ise_selector_block_clicked_cb, NULL);
+    elm_object_part_text_set (_ise_selector, "title,text", _("Select input method"));
+
+    /* Create box for adjusting the height of list */
+    box = elm_box_add (_ise_selector);
+    evas_object_size_hint_weight_set (box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+    itc.item_style = "1text.1icon/popup";
+    itc.func.text_get = gl_ise_name_get;
+    itc.func.content_get = gl_icon_get;
+    itc.func.state_get = NULL;
+    itc.func.del = NULL;
+
+    genlist = elm_genlist_add (box);
+    evas_object_size_hint_weight_set (genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+    for (index = 0; index < _uuids.size (); index++) {
+        if (_modes[index] ==  _panel_agent->get_current_toolbar_mode ())
+            elm_genlist_item_append (genlist, &itc, (void *) index, NULL, ELM_GENLIST_ITEM_NONE, gl_ise_selected_cb, (void *)index);
+    }
+
+    elm_box_pack_end (box, genlist);
+    evas_object_show (genlist);
+
+    /* The height of popup being adjusted by application here based on app requirement */
+    item_count = elm_genlist_items_count (genlist);
+
+    if (item_count > MAX_SELECT_IME_ITEM)
+        height = SELECT_IME_ITEM_HEIGHT * MAX_SELECT_IME_ITEM;
+    else
+        height = SELECT_IME_ITEM_HEIGHT*item_count;
+
+    evas_object_size_hint_min_set (box, 618, height);
+    evas_object_show (box);
+
+    elm_object_content_set (_ise_selector, box);
+    evas_object_show (_ise_selector);
+
+    Evas_Object *center_popup_win = center_popup_win_get (_ise_selector);
+    evas_event_callback_add (evas_object_evas_get (center_popup_win), EVAS_CALLBACK_CANVAS_FOCUS_OUT, ise_selector_focus_out_cb, NULL);
+
+    efl_set_transient_for_app_window (elm_win_xwindow_get (center_popup_win));
+}
+#endif
+
+static bool tokenize_tag (const String& str, struct image *image_token)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " str=" << str << ", length=" << str.length () << "\n";
+    if (str.length () <= 0) {
+        LOGW ("str is empty!!!\n");
+        return false;
+    }
+
+    char **tag_str = NULL;
+    int i = 0;
+    tag_str = eina_str_split (str.c_str (), "\u3013", 0);
+
+    for (i = 0; tag_str [i]; i++) {
+        if (i == 0) {
+            if (str.length () == strlen (tag_str[i])) {
+                if (tag_str) {
+                    if (tag_str[0])
+                        free (tag_str[0]);
+
+                    free (tag_str);
+                }
+                return false;
+            }
+
+            image_token->path = String (tag_str[i]);
+        } else {
+            if (i - 1 < EMOJI_IMAGE_END)
+                image_token->emoji_option [i - 1] = atoi (tag_str[i]);
+            else
+                LOGW ("emoji option is more than EMOJI_IMAGE_END!!!\n");
+        }
+    }
+
+    if (tag_str) {
+        if (tag_str[0])
+            free (tag_str[0]);
+
+        free (tag_str);
+    }
+
+    return true;
+}
+
+static Evas_Object* get_candidate (const String& str, Evas_Object *parent, int *total_width, uint32 ForeGround, uint32 BackGround, bool HighLight, bool SetBack, int item_num, int item_index)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " str=" << str << ", length=" << str.length () << "\n";
+
+    struct image image_data;
+    int object_width = 0, text_width = 0, image_width = 0, image_height = 0, max_width = 0, button_width = 0;
+    int i = 0, j = 0;
+    int image_get_width = 0, image_get_height = 0;
+    char image_key [10] = {0, };
+    char **splited_string = NULL;
+    char **sub_splited_string = NULL;
+    double image_rate = 0.0;
+    bool tokenize_result = false;
+    bool candidate_is_long = false;
+
+    Evas_Object *candidate_object_table = NULL;
+    Evas_Object *candidate_object_table_bg_rect = NULL;
+    Evas_Object *candidate_left_padding = NULL;
+
+    candidate_object_table = elm_table_add (parent);
+
+    candidate_left_padding = evas_object_rectangle_add (evas_object_evas_get (parent));
+    evas_object_size_hint_weight_set (candidate_left_padding, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (candidate_left_padding, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_min_set (candidate_left_padding, _blank_width, 1);
+    evas_object_color_set (candidate_left_padding, 0, 0, 0, 0);
+    elm_table_pack (candidate_object_table, candidate_left_padding, 0, 0, _blank_width, 1);
+    evas_object_show (candidate_left_padding);
+
+    object_width += _blank_width;
+    if (item_num > 1 && item_index == 0)
+        button_width = 92 * _width_rate;
+    else
+        button_width = 0;
+
+    splited_string = eina_str_split (str.c_str (), "\uE000", 0);
+    for (i = 0; splited_string [i]; i++) {
+        if (candidate_is_long)
+            break;
+        sub_splited_string = eina_str_split (splited_string[i], "\uE001", 0);
+        for (j = 0; sub_splited_string [j]; j++) {
+            if (candidate_is_long)
+                break;
+            tokenize_result = tokenize_tag (sub_splited_string[j], &image_data);
+            if (tokenize_result && _candidate_image_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) {
+                _candidate_image [_candidate_image_count] = elm_image_add (parent);
+                snprintf (image_key, sizeof (image_key), "%d",_candidate_image_count);
+                elm_image_file_set (_candidate_image [_candidate_image_count], image_data.path.c_str (), image_key);
+                elm_image_animated_set (_candidate_image [_candidate_image_count], EINA_TRUE);
+                elm_image_animated_play_set (_candidate_image [_candidate_image_count], EINA_TRUE);
+                elm_image_object_size_get (_candidate_image [_candidate_image_count], &image_get_width, &image_get_height);
+                LOGD ("image_path=%s, key=%s\n", image_data.path.c_str (), image_key);
+
+                if (image_get_height > image_get_width)
+                    image_rate = ((double)candidate_image_height / (double)image_get_width);
+                else
+                    image_rate = ((double)candidate_image_height / (double)image_get_height);
+
+                image_width = (int)((double)image_get_width * image_rate);
+                image_height = candidate_image_height;
+
+                if (_candidate_angle == 90 || _candidate_angle == 270)
+                    max_width = _candidate_land_width - (_blank_width + object_width + button_width + (2 * CANDIDATE_TEXT_OFFSET));
+                else
+                    max_width = _candidate_port_width - (_blank_width + object_width + button_width + (2 * CANDIDATE_TEXT_OFFSET));
+
+                if (image_width > max_width) {
+                    Evas_Object *candidate_end = edje_object_add (evas_object_evas_get (parent));
+                    edje_object_file_set (candidate_end, _candidate_edje_file.c_str (), _candidate_name.c_str ());
+                    evas_object_show (candidate_end);
+                    edje_object_part_text_set (candidate_end, "candidate", "...");
+                    edje_object_scale_set (_candidate_text [_candidate_text_count], _height_rate);
+
+                    text_width = max_width;
+                    evas_object_size_hint_min_set (candidate_end, text_width + (2 * CANDIDATE_TEXT_OFFSET), _item_min_height);
+                    if (HighLight || SetBack) {
+                        set_highlight_color (candidate_end, ForeGround, BackGround, SetBack);
+                    }
+                    elm_table_pack (candidate_object_table, candidate_end, object_width, 0, text_width + (2 * CANDIDATE_TEXT_OFFSET), _candidate_font_size);
+                    object_width += (text_width + (2 * CANDIDATE_TEXT_OFFSET));
+
+                    if (_candidate_image [_candidate_image_count]) {
+                        evas_object_del (_candidate_image [_candidate_image_count]);
+                        _candidate_image [_candidate_image_count] = NULL;
+                    }
+                    candidate_is_long = true;
+                    break;
+                }
+
+                evas_object_resize (_candidate_image [_candidate_image_count], image_width, image_height);
+                evas_object_show (_candidate_image [_candidate_image_count]);
+                evas_object_size_hint_min_set (_candidate_image [_candidate_image_count], image_width, image_height);
+
+                elm_table_pack (candidate_object_table, _candidate_image [_candidate_image_count], object_width, 1, image_width, image_height);
+                object_width += image_width;
+                _candidate_image_count++;
+
+                if (image_data.emoji_option [EMOJI_IMAGE_POP_FLAG] == 1 && image_width > 0 &&  _candidate_pop_image_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) {
+                    _candidate_pop_image [_candidate_pop_image_count] = elm_image_add (parent);
+                    elm_image_file_set (_candidate_pop_image [_candidate_pop_image_count], ISF_POP_PLAY_ICON_FILE, image_key);
+                    evas_object_resize (_candidate_pop_image [_candidate_pop_image_count], candidate_play_image_width_height, candidate_play_image_width_height);
+                    evas_object_show (_candidate_pop_image [_candidate_pop_image_count]);
+                    evas_object_size_hint_min_set (_candidate_pop_image [_candidate_pop_image_count], candidate_play_image_width_height, candidate_play_image_width_height);
+
+                    elm_table_pack (candidate_object_table, _candidate_pop_image [_candidate_pop_image_count],
+                            object_width - candidate_play_image_width_height, image_height - candidate_play_image_width_height - 2,
+                            candidate_play_image_width_height, candidate_play_image_width_height);
+
+                    _candidate_pop_image_count++;
+                }
+
+            } else if (strlen (sub_splited_string [j]) > 0 && _candidate_text_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) {
+                _candidate_text [_candidate_text_count] = edje_object_add (evas_object_evas_get (parent));
+                edje_object_file_set (_candidate_text [_candidate_text_count], _candidate_edje_file.c_str (), _candidate_name.c_str ());
+                evas_object_show (_candidate_text [_candidate_text_count]);
+                edje_object_part_text_set (_candidate_text [_candidate_text_count], "candidate", sub_splited_string [j]);
+                edje_object_text_class_set (_candidate_text [_candidate_text_count], "tizen",
+                    _candidate_font_name.c_str (), _candidate_font_size);
+                evas_object_text_text_set (_tmp_candidate_text, sub_splited_string[j]);
+                evas_object_geometry_get (_tmp_candidate_text, NULL, NULL, &text_width, NULL);
+
+                if (_candidate_angle == 90 || _candidate_angle == 270)
+                    max_width = _candidate_land_width - (_blank_width + object_width + button_width + (2 * CANDIDATE_TEXT_OFFSET));
+                else
+                    max_width = _candidate_port_width - (_blank_width + object_width + button_width + (2 * CANDIDATE_TEXT_OFFSET));
+
+                if (text_width > max_width) {
+                    candidate_is_long = true;
+                    /* In order to avoid overlap issue, calculate show_string */
+                    String show_string = String (sub_splited_string [j]);
+                    int    show_length = text_width;
+                    while (show_length > max_width && show_string.length () > 1) {
+                        show_string = show_string.substr (0, show_string.length () - 1);
+                        evas_object_text_text_set (_tmp_candidate_text, (show_string + String ("...")).c_str ());
+                        evas_object_geometry_get (_tmp_candidate_text, NULL, NULL, &show_length, NULL);
+                    }
+                    edje_object_part_text_set (_candidate_text [_candidate_text_count], "candidate", (show_string + String ("...")).c_str ());
+                    text_width = max_width;
+                }
+
+                evas_object_size_hint_min_set (_candidate_text [_candidate_text_count], text_width + (2 * CANDIDATE_TEXT_OFFSET), _item_min_height);
+                if (HighLight || SetBack) {
+                    set_highlight_color (_candidate_text [_candidate_text_count], ForeGround, BackGround, SetBack);
+                }
+                elm_table_pack (candidate_object_table, _candidate_text[_candidate_text_count], object_width, 0, text_width + (2 * CANDIDATE_TEXT_OFFSET), _candidate_font_size);
+                object_width += (text_width + (2 * CANDIDATE_TEXT_OFFSET));
+                _candidate_text_count++;
+            }
+        }
+    }
+
+    if (splited_string) {
+        if (splited_string[0])
+            free (splited_string[0]);
+
+        free (splited_string);
+    }
+
+    if (sub_splited_string) {
+        if (sub_splited_string[0])
+            free (sub_splited_string[0]);
+
+        free (sub_splited_string);
+    }
+
+    *total_width = object_width + _blank_width;
+
+    candidate_object_table_bg_rect = edje_object_add (evas_object_evas_get (parent));
+    edje_object_file_set (candidate_object_table_bg_rect, _candidate_edje_file.c_str (), "candidate_object_table");
+    evas_object_size_hint_weight_set (candidate_object_table_bg_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (candidate_object_table_bg_rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_min_set (candidate_object_table_bg_rect, *total_width, _item_min_height);
+    elm_table_pack (candidate_object_table, candidate_object_table_bg_rect, 0, 0, *total_width ,_item_min_height);
+    evas_object_show (candidate_object_table_bg_rect);
+
+    evas_object_size_hint_align_set (candidate_object_table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_weight_set (candidate_object_table, EVAS_HINT_EXPAND, 0.0);
+
+    return candidate_object_table;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // Implementation of internal functions.
 /////////////////////////////////////////////////////////////////////////////
@@ -409,7 +992,7 @@ static struct rectinfo get_ise_geometry ()
     struct rectinfo info = {0, 0, 0, 0};
 
     int win_w = _screen_width, win_h = _screen_height;
-    int angle = (_window_angle == -1) ? efl_get_angle_for_app_window () : _window_angle;
+    int angle = (_ise_angle == -1) ? efl_get_app_window_angle () : _ise_angle;
 
     if (angle == 90 || angle == 270) {
         win_w = _screen_height;
@@ -419,6 +1002,12 @@ static struct rectinfo get_ise_geometry ()
     /* If we have geometry reported by ISE, use the geometry information */
     if (_ise_reported_geometry.valid && _ise_reported_geometry.angle == angle) {
         info = _ise_reported_geometry.geometry;
+        /* But still, if the current ISE is not in SHOW state, set w/h to 0 */
+        if (_ise_state != WINDOW_STATE_SHOW) {
+            info.pos_y = (win_h > win_w) ? win_h : win_w;
+            info.width = 0;
+            info.height = 0;
+        }
     } else {
         /* READ ISE's SIZE HINT HERE */
         int pos_x, pos_y, width, height;
@@ -451,9 +1040,10 @@ static struct rectinfo get_ise_geometry ()
                 }
             }
 
-            LOGD ("Geometry : %d %d %d, %d %d %d %d\n", angle, _window_angle,
-                _panel_agent->get_current_toolbar_mode (),
-                info.pos_x, info.pos_y, info.width, info.height);
+            LOGD ("angle : %d, w_angle : %d, mode : %d, Geometry : %d %d %d %d\n",
+                    angle, _ise_angle,
+                    _panel_agent->get_current_toolbar_mode (),
+                    info.pos_x, info.pos_y, info.width, info.height);
         } else {
             pos_x = 0;
             pos_y = 0;
@@ -461,6 +1051,7 @@ static struct rectinfo get_ise_geometry ()
             height = 0;
         }
     }
+
     _ise_width  = info.width;
     _ise_height = info.height;
 
@@ -477,13 +1068,13 @@ static void set_keyboard_geometry_atom_info (Ecore_X_Window window, struct recti
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    if (hw_kbd_mode) {
+    if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
         ise_rect.pos_x = 0;
         if (_candidate_window && _candidate_state == WINDOW_STATE_SHOW) {
             ise_rect.width  = _candidate_width;
             ise_rect.height = _candidate_height;
         }
-        int angle = efl_get_angle_for_app_window ();
+        int angle = efl_get_app_window_angle ();
         if (angle == 90 || angle == 270)
             ise_rect.pos_y = _screen_width - ise_rect.height;
         else
@@ -524,9 +1115,9 @@ static void set_keyboard_geometry_atom_info (Ecore_X_Window window, struct recti
  *
  * @return The ISE index
  */
-static int get_ise_index (const String uuid)
+static unsigned int get_ise_index (const String uuid)
 {
-    int index = 0;
+    unsigned int index = 0;
     if (uuid.length () > 0) {
         for (unsigned int i = 0; i < _uuids.size (); i++) {
             if (uuid == _uuids[i]) {
@@ -599,7 +1190,9 @@ static int osp_module_list_get (std::vector <String> &ops_module_names)
             while (file) {
                 struct stat filestat;
                 String absfn = path + String (SCIM_PATH_DELIM_STRING) + file->d_name;
-                stat (absfn.c_str (), &filestat);
+                if (stat (absfn.c_str (), &filestat) == -1)
+                    continue;
+
                 if (S_ISREG (filestat.st_mode)) {
                     String link_name = String (file->d_name);
                     ops_module_names.push_back (link_name.substr (0, link_name.find_last_of ('.')));
@@ -628,7 +1221,9 @@ static String osp_module_name_get (const String &path)
         while (file) {
             struct stat filestat;
             String absfn = bin_path + String (SCIM_PATH_DELIM_STRING) + file->d_name;
-            stat (absfn.c_str (), &filestat);
+            if (stat (absfn.c_str (), &filestat) == -1)
+                continue;
+
             if (S_ISREG (filestat.st_mode)) {
                 String ext = absfn.substr (absfn.length () - 4);
                 if (ext == String (".exe")) {
@@ -642,7 +1237,7 @@ static String osp_module_name_get (const String &path)
         }
         closedir (dir);
     } else {
-        LOGD ("open (%s) is failed!!!", bin_path.c_str ());
+        LOGW ("open (%s) is failed!!!", bin_path.c_str ());
     }
     String module_name = String ("");
     if (ise_name.length () > 0)
@@ -670,10 +1265,9 @@ static void osp_engine_dir_monitor_cb (void *data, Ecore_File_Monitor *em, Ecore
                       String (SCIM_PATH_DELIM_STRING) + String ("Helper") + String (SCIM_PATH_DELIM_STRING) + module_name + String (".so");
                 isf_update_ise_module (String (module_path), _config);
                 _panel_agent->update_ise_list (_uuids);
-                _panel_agent->reload_config ();
-#if 0
+
                 String uuid  = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), _initial_ise_uuid);
-                int    index = get_ise_index (uuid);
+                unsigned int index = get_ise_index (uuid);
                 if (_modes[index] == TOOLBAR_HELPER_MODE) {
                     String active_module = get_module_file_path (_module_names[index], String ("Helper"));
                     if (String (module_path) == active_module) {
@@ -683,7 +1277,6 @@ static void osp_engine_dir_monitor_cb (void *data, Ecore_File_Monitor *em, Ecore
                         _panel_agent->start_helper (uuid);
                     }
                 }
-#endif
             }
         }
     }
@@ -694,13 +1287,23 @@ static void add_monitor_for_osp_module (const String &module_name)
     String rpath         = String ("/opt/apps/") + module_name.substr (0, module_name.find_first_of ('.'));
     String exe_path      = rpath + String ("/bin");
     String manifest_path = rpath + String ("/info");
+    struct stat filestat;
 
-    if (_osp_bin_em.find (module_name) == _osp_bin_em.end () || _osp_bin_em[module_name] == NULL) {
-        _osp_bin_em[module_name] = ecore_file_monitor_add (exe_path.c_str (), osp_engine_dir_monitor_cb, NULL);
-        LOGD ("add %s", module_name.c_str ());
+    if (stat (exe_path.c_str (), &filestat) == 0) {
+        if (_osp_bin_em.find (module_name) == _osp_bin_em.end () || _osp_bin_em[module_name] == NULL) {
+            _osp_bin_em[module_name] = ecore_file_monitor_add (exe_path.c_str (), osp_engine_dir_monitor_cb, NULL);
+            LOGD ("add %s", module_name.c_str ());
+        }
+    } else {
+        LOGW ("can't access : %s, reason : %s\n", exe_path.c_str (), strerror (errno));
     }
-    if (_osp_info_em.find (module_name) == _osp_info_em.end () || _osp_info_em[module_name] == NULL) {
-        _osp_info_em[module_name] = ecore_file_monitor_add (manifest_path.c_str (), osp_engine_dir_monitor_cb, NULL);
+
+    if (stat (manifest_path.c_str (), &filestat) == 0) {
+        if (_osp_info_em.find (module_name) == _osp_info_em.end () || _osp_info_em[module_name] == NULL) {
+            _osp_info_em[module_name] = ecore_file_monitor_add (manifest_path.c_str (), osp_engine_dir_monitor_cb, NULL);
+        }
+    } else {
+        LOGW ("can't access : %s, reason : %s\n", manifest_path.c_str (), strerror (errno));
     }
 }
 
@@ -738,7 +1341,7 @@ static void ise_file_monitor_cb (void *data, Ecore_File_Monitor *em, Ecore_File_
         String file_path = String (path);
         String file_ext  = file_path.substr (file_path.length () - 3);
         if (file_ext != String (".so")) {
-            LOGD ("%s is not valid so file!!!", path);
+            LOGW ("%s is not valid so file!!!", path);
             return;
         }
 
@@ -762,13 +1365,12 @@ static void ise_file_monitor_cb (void *data, Ecore_File_Monitor *em, Ecore_File_
                 ecore_file_monitor_del (iter->second);
                 _osp_info_em.erase (iter);
             }
-        } else if (event == ECORE_FILE_EVENT_CLOSED) {
+        } else if (event == ECORE_FILE_EVENT_CLOSED || ECORE_FILE_EVENT_CREATED_FILE) {
             isf_update_ise_module (String (path), _config);
             _panel_agent->update_ise_list (_uuids);
-            _panel_agent->reload_config ();
-#if 0
+
             String uuid    = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), _initial_ise_uuid);
-            int    index   = get_ise_index (uuid);
+            unsigned int index = get_ise_index (uuid);
             String strFile = String (ecore_file_monitor_path_get (em)) +
                              String (SCIM_PATH_DELIM_STRING) + _module_names[index] + String (".so");
 
@@ -784,7 +1386,6 @@ static void ise_file_monitor_cb (void *data, Ecore_File_Monitor *em, Ecore_File_
                 add_monitor_for_osp_module (module_name);
                 LOGD ("add %s", module_name.c_str ());
             }
-#endif
         }
     }
 }
@@ -860,7 +1461,7 @@ static void add_ise_directory_em (void) {
                 LOGD ("ecore_file_monitor_add path=%s", path.c_str ());
             }
         } else {
-            LOGD ("access path=%s is failed!!!", path.c_str ());
+            LOGW ("access path=%s is failed!!!", path.c_str ());
         }
 
         // OSP Helper path
@@ -873,10 +1474,10 @@ static void add_ise_directory_em (void) {
                 LOGD ("ecore_file_monitor_add path=%s", path.c_str ());
             }
         } else {
-            LOGD ("access path=%s is failed!!!", path.c_str ());
+            LOGW ("access path=%s is failed!!!", path.c_str ());
         }
     } else {
-        LOGD ("getenv (\"SCIM_MODULE_PATH\") is failed!!!");
+        LOGW ("getenv (\"SCIM_MODULE_PATH\") is failed!!!");
     }
 
     add_monitor_for_all_osp_modules ();
@@ -937,24 +1538,13 @@ static bool set_helper_ise (const String &uuid, const String &module_name)
         _panel_agent->hide_helper (pre_uuid);
         _panel_agent->stop_helper (pre_uuid);
         char buf[256] = {0};
-        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  stop helper(%s)\n",
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  stop helper (%s)\n",
             time (0), getpid (), __FILE__, __func__, pre_uuid.c_str ());
         isf_save_log (buf);
     }
 
-    /* Set ComposeKey as keyboard ISE */
-    uint32 kbd_option = 0;
-    String kbd_uuid, kbd_name;
-    isf_get_keyboard_ise (_config, kbd_uuid, kbd_name, kbd_option);
-    if (kbd_uuid != String (SCIM_COMPOSE_KEY_FACTORY_UUID)) {
-        kbd_uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
-        _panel_agent->change_factory (kbd_uuid);
-
-        String language = String ("~other");/*scim_get_locale_language (scim_get_current_locale ());*/
-        _config->write (String (SCIM_CONFIG_DEFAULT_IMENGINE_FACTORY) + String ("/") + language, kbd_uuid);
-    }
     char buf[256] = {0};
-    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Start helper(%s)\n",
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Start helper (%s)\n",
         time (0), getpid (), __FILE__, __func__, uuid.c_str ());
     isf_save_log (buf);
 
@@ -975,7 +1565,7 @@ static bool set_active_ise (const String &uuid)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
     char buf[256] = {0};
-    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  set ISE(%s)\n",
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  set ISE (%s)\n",
         time (0), getpid (), __FILE__, __func__, uuid.c_str ());
     isf_save_log (buf);
 
@@ -990,11 +1580,10 @@ static bool set_active_ise (const String &uuid)
                 ise_changed = set_keyboard_ise (_uuids[i], _module_names[i]);
             else if (TOOLBAR_HELPER_MODE == _modes[i])
                 ise_changed = set_helper_ise (_uuids[i], _module_names[i]);
-
+            _panel_agent->set_current_toolbar_mode (_modes[i]);
             if (ise_changed) {
-                _panel_agent->set_current_toolbar_mode (_modes[i]);
+                _panel_agent->set_current_helper_option (_options[i]);
                 _panel_agent->set_current_ise_name (_names[i]);
-
                 _ise_width  = 0;
                 _ise_height = 0;
                 _ise_state  = WINDOW_STATE_HIDE;
@@ -1046,17 +1635,6 @@ static void config_reload_cb (const ConfigPointer &config)
     /* load_config (); */
 }
 
-static Eina_Bool system_ready_timeout_cb (void *data)
-{
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    LOGW ("Launching IME because of appservice ready timeout\n");
-
-    _launch_default_soft_keyboard ();
-
-    return ECORE_CALLBACK_CANCEL;
-}
-
 //////////////////////////////////////////////////////////////////////
 // Start of Candidate Functions
 //////////////////////////////////////////////////////////////////////
@@ -1076,7 +1654,7 @@ static int ui_candidate_get_valid_height (void)
         if (_candidate_state == WINDOW_STATE_SHOW)
             angle = _candidate_angle;
         else
-            angle = efl_get_angle_for_app_window ();
+            angle = efl_get_app_window_angle ();
 
         if (_aux_area_visible && _candidate_area_1_visible) {
             if (angle == 90 || angle == 270)
@@ -1119,7 +1697,10 @@ static void ui_candidate_window_resize (int new_width, int new_height)
         height = ui_candidate_get_valid_height ();
         if ((_ise_width == 0 && _ise_height == 0) ||
             (_ise_height > 0 && _candidate_valid_height != height) ||
-            (_ise_height > 0 && (_candidate_height - height) > _ise_height)) {
+            (_ise_height > 0 && (_candidate_height - height) > _ise_height) ||
+            ((_candidate_angle == 90 || _candidate_angle == 270) && (_ise_width < _screen_height)) ||
+            ((_candidate_angle == 0  || _candidate_angle == 180) && (_ise_width > _screen_width ))) {
+
             set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
             _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
         }
@@ -1188,15 +1769,25 @@ static void ui_candidate_window_adjust (void)
         evas_object_show (_aux_line);
         evas_object_move (_candidate_area_1, _candidate_area_1_pos[0], _candidate_area_1_pos[1] + _candidate_port_height_min_2 - _candidate_port_height_min);
         if (_candidate_angle == 90 || _candidate_angle == 270) {
-            ui_candidate_window_resize (width, _candidate_land_height_max_2);
+            if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _ise_state == WINDOW_STATE_SHOW &&
+                _ise_height > _candidate_land_height_max_2 - _candidate_land_height_min_2)
+                ui_candidate_window_resize (width, _candidate_land_height_min_2 + _ise_height);
+            else
+                ui_candidate_window_resize (width, _candidate_land_height_max_2);
             evas_object_move (_close_btn, _close_btn_pos[2], _close_btn_pos[3] + _candidate_port_height_min_2 - _candidate_port_height_min);
             evas_object_move (_candidate_area_2, 0, _candidate_land_height_min_2);
             evas_object_move (_scroller_bg, 0, _candidate_land_height_min_2);
+            evas_object_resize (_candidate_bg, width, _candidate_land_height_min_2);
         } else {
-            ui_candidate_window_resize (width, _candidate_port_height_max_2);
+            if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _ise_state == WINDOW_STATE_SHOW &&
+                _ise_height > _candidate_port_height_max_2 - _candidate_port_height_min_2)
+                ui_candidate_window_resize (width, _candidate_port_height_min_2 + _ise_height);
+            else
+                ui_candidate_window_resize (width, _candidate_port_height_max_2);
             evas_object_move (_close_btn, _close_btn_pos[0], _close_btn_pos[1] + _candidate_port_height_min_2 - _candidate_port_height_min);
             evas_object_move (_candidate_area_2, 0, _candidate_port_height_min_2);
             evas_object_move (_scroller_bg, 0, _candidate_port_height_min_2);
+            evas_object_resize (_candidate_bg, width, _candidate_port_height_min_2);
         }
     } else if (_aux_area_visible && _candidate_area_1_visible) {
         evas_object_show (_aux_line);
@@ -1204,26 +1795,39 @@ static void ui_candidate_window_adjust (void)
         if (_candidate_angle == 90 || _candidate_angle == 270) {
             ui_candidate_window_resize (width, _candidate_land_height_min_2);
             evas_object_move (_more_btn, _more_btn_pos[2], _more_btn_pos[3] + _candidate_port_height_min_2 - _candidate_port_height_min);
+            evas_object_resize (_candidate_bg, width, _candidate_land_height_min_2);
         } else {
             ui_candidate_window_resize (width, _candidate_port_height_min_2);
             evas_object_move (_more_btn, _more_btn_pos[0], _more_btn_pos[1] + _candidate_port_height_min_2 - _candidate_port_height_min);
+            evas_object_resize (_candidate_bg, width, _candidate_port_height_min_2);
         }
     } else if (_aux_area_visible) {
         evas_object_hide (_aux_line);
         ui_candidate_window_resize (width, _aux_height + 2);
+        evas_object_resize (_candidate_bg, width, _aux_height + 2);
     } else if (_candidate_area_2_visible) {
         evas_object_hide (_aux_line);
         evas_object_move (_candidate_area_1, _candidate_area_1_pos[0], _candidate_area_1_pos[1]);
         if (_candidate_angle == 90 || _candidate_angle == 270) {
-            ui_candidate_window_resize (width, _candidate_land_height_max);
+            if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _ise_state == WINDOW_STATE_SHOW &&
+                _ise_height > _candidate_land_height_max - _candidate_land_height_min)
+                ui_candidate_window_resize (width, _candidate_land_height_min + _ise_height);
+            else
+                ui_candidate_window_resize (width, _candidate_land_height_max);
             evas_object_move (_close_btn, _close_btn_pos[2], _close_btn_pos[3]);
             evas_object_move (_candidate_area_2, 0, _candidate_land_height_min);
             evas_object_move (_scroller_bg, 0, _candidate_land_height_min);
+            evas_object_resize (_candidate_bg, width, _candidate_land_height_min);
         } else {
-            ui_candidate_window_resize (width, _candidate_port_height_max);
+            if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _ise_state == WINDOW_STATE_SHOW &&
+                _ise_height > _candidate_port_height_max - _candidate_port_height_min)
+                ui_candidate_window_resize (width, _candidate_port_height_min + _ise_height);
+            else
+                ui_candidate_window_resize (width, _candidate_port_height_max);
             evas_object_move (_close_btn, _close_btn_pos[0], _close_btn_pos[1]);
             evas_object_move (_candidate_area_2, 0, _candidate_port_height_min);
             evas_object_move (_scroller_bg, 0, _candidate_port_height_min);
+            evas_object_resize (_candidate_bg, width, _candidate_port_height_min);
         }
     } else {
         evas_object_hide (_aux_line);
@@ -1231,9 +1835,11 @@ static void ui_candidate_window_adjust (void)
         if (_candidate_angle == 90 || _candidate_angle == 270) {
             ui_candidate_window_resize (width, _candidate_land_height_min);
             evas_object_move (_more_btn, _more_btn_pos[2], _more_btn_pos[3]);
+            evas_object_resize (_candidate_bg, width, _candidate_land_height_min);
         } else {
             ui_candidate_window_resize (width, _candidate_port_height_min);
             evas_object_move (_more_btn, _more_btn_pos[0], _more_btn_pos[1]);
+            evas_object_resize (_candidate_bg, width, _candidate_port_height_min);
         }
     }
 }
@@ -1272,6 +1878,8 @@ static void ui_candidate_window_rotate (int angle)
     ui_candidate_window_adjust ();
     if (_candidate_area_1_visible) {
         update_table (ISF_CANDIDATE_TABLE, g_isf_candidate_table);
+        _candidate_tts_focus_index = INVALID_TTS_FOCUS_INDEX;
+        ui_tts_focus_rect_hide ();
     }
     flush_memory ();
 
@@ -1354,7 +1962,7 @@ static Eina_Bool ui_candidate_longpress_timeout (void *data)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    int index = (int)GPOINTER_TO_INT(data);
+    int index = (int)GPOINTER_TO_INT (data);
     ui_candidate_delete_longpress_timer ();
     _is_click = false;
     _panel_agent->send_longpress_event (_click_object, index);
@@ -1407,7 +2015,7 @@ static Eina_Bool off_prepare_done_timeout (void *data)
     // WILL_HIDE_REQUEST_DONE Ack to WM
     Ecore_X_Window root_window = ecore_x_window_root_get (_control_window);
     ecore_x_e_virtual_keyboard_off_prepare_done_send (root_window, _control_window);
-    LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send(%x, %x)\n",
+    LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)\n",
             root_window, _control_window);
 
     _off_prepare_done_timer = NULL;
@@ -1443,7 +2051,7 @@ static void candidate_window_hide (void)
            candidate window should be displayed but STATE_OFF for the first ISE_HIDE
            calls this function, so when the candidate window is shown by the following
            STATE_ON message, a blank area is displayed in candidate window -
-           so we let the _cnadidate_area_1 as the default area that would be displayed */
+           so we let the _candidate_area_1 as the default area that would be displayed */
         //evas_object_hide (_candidate_area_1);
         //evas_object_hide (_more_btn);
         _candidate_area_1_visible = false;
@@ -1462,7 +2070,9 @@ static void candidate_window_hide (void)
  */
 static Eina_Bool candidate_hide_timer (void *data)
 {
-    LOGD ("calling candidate_window_hide()");
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    LOGD ("calling candidate_window_hide ()");
     candidate_window_hide ();
 
     return ECORE_CALLBACK_CANCEL;
@@ -1491,7 +2101,7 @@ static void delete_candidate_show_handler (void)
 
 static Eina_Bool x_event_window_show_cb (void *data, int ev_type, void *event)
 {
-    delete_candidate_show_handler();
+    delete_candidate_show_handler ();
 
     Ecore_X_Event_Window_Show *e = (Ecore_X_Event_Window_Show*)event;
     if (_candidate_state == WINDOW_STATE_WILL_SHOW) {
@@ -1510,9 +2120,9 @@ static Eina_Bool x_event_window_show_cb (void *data, int ev_type, void *event)
             /* And the state event */
             _panel_agent->update_candidate_panel_event ((uint32)ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT, (uint32)ECORE_IMF_CANDIDATE_PANEL_SHOW);
 
-            /* If we are in hardward keyboard mode, this candidate window is now considered to be a input panel */
+            /* If we are in hardware keyboard mode, this candidate window is now considered to be a input panel */
             if (_candidate_mode == FIXED_CANDIDATE_WINDOW) {
-                if (hw_kbd_mode) {
+                if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
                     _panel_agent->update_input_panel_event ((uint32)ECORE_IMF_INPUT_PANEL_STATE_EVENT, (uint32)ECORE_IMF_INPUT_PANEL_STATE_SHOW);
                 }
             }
@@ -1534,20 +2144,26 @@ static Eina_Bool x_event_window_show_cb (void *data, int ev_type, void *event)
 static void ui_candidate_show (bool bSetVirtualKbd)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-    int hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
 
     delete_candidate_hide_timer ();
 
     if (!_candidate_window) return;
+    if (_candidate_mode == SOFT_CANDIDATE_WINDOW)
+        return;
 
-   /* FIXME : SHOULD UNIFY THE METHOD FOR CHECKING THE HW KEYBOARD EXISTENCE */
-   /* If the ISE is not visible currently, wait for the ISE to be opened and then show our candidate window */
-   _candidate_show_requested = true;
-   if( (hw_kbd_detect == 0 && _ise_state != WINDOW_STATE_SHOW)) {
-        LOGD ("setting _show_can didate_requested to TRUE");
+    /* FIXME : SHOULD UNIFY THE METHOD FOR CHECKING THE HW KEYBOARD EXISTENCE */
+    /* If the ISE is not visible currently, wait for the ISE to be opened and then show our candidate window */
+    _candidate_show_requested = true;
+    if ((_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) && (_ise_state != WINDOW_STATE_SHOW)) {
+        LOGD ("setting _show_candidate_requested to TRUE");
         return;
     }
 
+    /* If the ISE angle is valid, respect the value to make sure
+       the candidate window always have the same angle with ISE */
+    if (_ise_angle != -1) {
+        _candidate_angle = _ise_angle;
+    }
     ui_candidate_window_rotate (_candidate_angle);
 
     /* If the candidate window was about to hide, turn it back to SHOW state now */
@@ -1560,6 +2176,18 @@ static void ui_candidate_show (bool bSetVirtualKbd)
         _candidate_state = WINDOW_STATE_WILL_SHOW;
     }
 
+    if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
+        /* WMSYNC, #3 Clear the existing application's conformant area and set transient_for */
+        // Unset conformant area
+        Ecore_X_Window current_app_window = efl_get_app_window ();
+        if (_app_window != current_app_window) {
+            struct rectinfo info = {0, 0, 0, 0};
+            info.pos_y = _screen_width > _screen_height ? _screen_width : _screen_height;
+            set_keyboard_geometry_atom_info (_app_window, info);
+            LOGD ("Conformant reset for window %x\n", _app_window);
+            _app_window = current_app_window;
+        }
+    }
     if (_candidate_mode == FIXED_CANDIDATE_WINDOW) {
         if (bSetVirtualKbd) {
             set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
@@ -1579,9 +2207,9 @@ static void ui_candidate_show (bool bSetVirtualKbd)
         edje_object_file_set (_close_btn, _candidate_edje_file.c_str (), "more_button");
     }
 
-    /* If we are in hardward keyboard mode, this candidate window is now considered to be a input panel */
+    /* If we are in hardware keyboard mode, this candidate window is now considered to be a input panel */
     if (_candidate_mode == FIXED_CANDIDATE_WINDOW) {
-        if (hw_kbd_mode) {
+        if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
             LOGD ("sending ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW");
             _panel_agent->update_input_panel_event ((uint32)ECORE_IMF_INPUT_PANEL_STATE_EVENT, (uint32)ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW);
         }
@@ -1603,9 +2231,9 @@ static void ui_candidate_show (bool bSetVirtualKbd)
         /* And the state event */
         _panel_agent->update_candidate_panel_event ((uint32)ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT, (uint32)ECORE_IMF_CANDIDATE_PANEL_SHOW);
 
-        /* If we are in hardward keyboard mode, this candidate window is now considered to be a input panel */
+        /* If we are in hardware keyboard mode, this candidate window is now considered to be a input panel */
         if (_candidate_mode == FIXED_CANDIDATE_WINDOW) {
-            if (hw_kbd_mode) {
+            if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
                 _panel_agent->update_input_panel_event ((uint32)ECORE_IMF_INPUT_PANEL_STATE_EVENT, (uint32)ECORE_IMF_INPUT_PANEL_STATE_SHOW);
             }
         }
@@ -1647,8 +2275,6 @@ static void ui_candidate_hide (bool bForce, bool bSetVirtualKbd, bool will_hide)
             _candidate_hide_timer = ecore_timer_add (2.0, candidate_hide_timer, NULL);
         }
 
-        _panel_agent->update_candidate_panel_event ((uint32)ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT, (uint32)ECORE_IMF_CANDIDATE_PANEL_HIDE);
-
         if (_candidate_mode == FIXED_CANDIDATE_WINDOW) {
             _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
             /* FIXME : should check if bSetVirtualKbd flag is really needed in this case */
@@ -1659,12 +2285,15 @@ static void ui_candidate_hide (bool bForce, bool bSetVirtualKbd, bool will_hide)
                     set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
                 }
             }
-            if (hw_kbd_mode) {
+            if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
                 _panel_agent->update_input_panel_event
                     ((uint32)ECORE_IMF_INPUT_PANEL_STATE_EVENT, (uint32)ECORE_IMF_INPUT_PANEL_STATE_HIDE);
             }
         }
 
+        /* Update the new keyboard geometry first, and then send the candidate hide event */
+        _panel_agent->update_candidate_panel_event ((uint32)ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT, (uint32)ECORE_IMF_CANDIDATE_PANEL_HIDE);
+
         if (!will_hide) {
             /* If we are not in will_hide state, hide the candidate window immediately */
             candidate_window_hide ();
@@ -1687,9 +2316,33 @@ static void ui_candidate_window_more_button_cb (void *data, Evas *e, Evas_Object
 
     _panel_agent->candidate_more_window_show ();
 
-    if (_candidate_angle == 180 || _candidate_angle == 270) {
+    if (candidate_expanded == false) {
+        candidate_expanded = true;
+        int number = SCIM_LOOKUP_TABLE_MAX_PAGESIZE;
+        for (int i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; ++i) {
+            if (_candidate_0 [i] == NULL) {
+                number = i;
+                break;
+            }
+        }
+        if (g_isf_candidate_table.get_current_page_size () != number)
+            update_table (ISF_CANDIDATE_TABLE, g_isf_candidate_table);
+    }
+
+    if (_candidate_angle == 180) {
         Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window));
         ecore_evas_move_resize (ee, 0, 0, 0, 0);
+        LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, 0, 0, 0, 0);
+    } else if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _candidate_angle == 270) {
+        /*
+         * when screen rotate 270 degrees, candidate have to move then resize for expanding more
+         * candidates, but it will flash or locate in a wrong position, this code just a workaround
+         * for avoiding this situation.
+         */
+        Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window));
+        ecore_evas_move_resize (ee, 0, 0, _screen_height, ui_candidate_get_valid_height () + _ise_height);
+        LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)",
+            ee, 0, 0, _screen_height, ui_candidate_get_valid_height () + _ise_height);
     }
 
     evas_object_show (_candidate_area_2);
@@ -1718,20 +2371,33 @@ static void ui_candidate_window_close_button_cb (void *data, Evas *e, Evas_Objec
     if (_candidate_area_2 == NULL || !_candidate_area_2_visible)
         return;
 
+    _panel_agent->candidate_more_window_hide ();
+
     evas_object_hide (_candidate_area_2);
     _candidate_area_2_visible = false;
     evas_object_hide (_scroller_bg);
     evas_object_hide (_close_btn);
-    _panel_agent->candidate_more_window_hide ();
 
+    candidate_expanded = false;
     evas_object_show (_candidate_area_1);
     _candidate_area_1_visible = true;
     evas_object_show (_more_btn);
 
     elm_scroller_region_show (_candidate_area_2, 0, 0, _candidate_scroll_width, 100);
-    if (_candidate_angle == 180 || _candidate_angle == 270) {
+    if (_candidate_angle == 180) {
         Ecore_Evas *ee= ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window));
         ecore_evas_move_resize (ee, 0, 0, 0, 0);
+        LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, 0, 0, 0, 0);
+    } else if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _candidate_angle == 270) {
+        /*
+         * when screen rotate 270 degrees, candidate have to move then resize for expanding more
+         * candidates, but it will flash or locate in a wrong position, this code just a workaround
+         * for avoiding this situation.
+         */
+        Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window));
+        ecore_evas_move_resize (ee, _ise_height, 0, _screen_height, ui_candidate_get_valid_height ());
+        LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)",
+            ee, _ise_height, 0, _screen_height, ui_candidate_get_valid_height ());
     }
 
     ui_candidate_window_adjust ();
@@ -1764,20 +2430,27 @@ static void ui_mouse_button_pressed_cb (void *data, Evas *e, Evas_Object *button
 #if HAVE_FEEDBACK
         if (feedback_initialized) {
             int feedback_result = 0;
+            bool sound_feedback = _config->read (SCIM_GLOBAL_CONFIG_PANEL_SOUND_FEEDBACK, false);
 
-            feedback_result = feedback_play_type (FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_SIP);
+            if (sound_feedback) {
+                feedback_result = feedback_play_type (FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_SIP);
 
-            if (FEEDBACK_ERROR_NONE == feedback_result)
-                LOGD ("Sound play successful");
-            else
-                LOGW ("Cannot play feedback sound : %d", feedback_result);
+                if (FEEDBACK_ERROR_NONE == feedback_result)
+                    LOGD ("Sound play successful");
+                else
+                    LOGW ("Cannot play feedback sound : %d", feedback_result);
+            }
 
-            feedback_result = feedback_play_type (FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_SIP);
+            bool vibrate_feedback = _config->read (SCIM_GLOBAL_CONFIG_PANEL_VIBRATION_FEEDBACK, false);
 
-            if (FEEDBACK_ERROR_NONE == feedback_result)
-                LOGD ("Vibration play successful");
-            else
-                LOGW ("Cannot play feedback vibration : %d", feedback_result);
+            if (vibrate_feedback) {
+                feedback_result = feedback_play_type (FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_SIP);
+
+                if (FEEDBACK_ERROR_NONE == feedback_result)
+                    LOGD ("Vibration play successful");
+                else
+                    LOGW ("Cannot play feedback vibration : %d", feedback_result);
+            }
         }
 #endif
 
@@ -1867,26 +2540,26 @@ static bool ui_open_tts (void)
 #if HAVE_TTS
     int r = tts_create (&_tts);
     if (TTS_ERROR_NONE != r) {
-        LOGW ("tts_create FAILED : result(%d)\n", r);
+        LOGW ("tts_create FAILED : result (%d)\n", r);
         _tts = NULL;
         return false;
     }
 
     r = tts_set_mode (_tts, TTS_MODE_SCREEN_READER);
     if (TTS_ERROR_NONE != r) {
-        LOGW ("tts_set_mode FAILED : result(%d)\n", r);
+        LOGW ("tts_set_mode FAILED : result (%d)\n", r);
     }
 
     tts_state_e current_state;
     r = tts_get_state (_tts, &current_state);
     if (TTS_ERROR_NONE != r) {
-        LOGW ("tts_get_state FAILED : result(%d)\n", r);
+        LOGW ("tts_get_state FAILED : result (%d)\n", r);
     }
 
     if (TTS_STATE_CREATED == current_state)  {
         r = tts_prepare (_tts);
         if (TTS_ERROR_NONE != r) {
-            LOGW ("tts_prepare FAILED : ret(%d)\n", r);
+            LOGW ("tts_prepare FAILED : ret (%d)\n", r);
         }
     }
     return true;
@@ -1906,12 +2579,12 @@ static void ui_close_tts (void)
     if (_tts) {
         int r = tts_unprepare (_tts);
         if (TTS_ERROR_NONE != r) {
-            LOGW ("tts_unprepare FAILED : result(%d)\n", r);
+            LOGW ("tts_unprepare FAILED : result (%d)\n", r);
         }
 
         r = tts_destroy (_tts);
         if (TTS_ERROR_NONE != r) {
-            LOGW ("tts_destroy FAILED : result(%d)\n", r);
+            LOGW ("tts_destroy FAILED : result (%d)\n", r);
         }
     }
 #endif
@@ -1939,21 +2612,34 @@ static void ui_play_tts (const char* str)
 
         r = tts_get_state (_tts, &current_state);
         if (TTS_ERROR_NONE != r) {
-            LOGW ("Fail to get state from TTS : ret(%d)\n", r);
+            LOGW ("Fail to get state from TTS : ret (%d)\n", r);
         }
 
         if (TTS_STATE_PLAYING == current_state)  {
             r = tts_stop (_tts);
             if (TTS_ERROR_NONE != r) {
-                LOGW ("Fail to stop TTS : ret(%d)\n", r);
+                LOGW ("Fail to stop TTS : ret (%d)\n", r);
+            }
+        }
+
+        /* Get ISE language */
+        String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), String (""));
+        String language = String ("en_US");
+        if (default_uuid.length () > 0) {
+            language = _langs [get_ise_index (default_uuid)];
+            if (language.length () > 0) {
+                std::vector<String> ise_langs;
+                scim_split_string_list (ise_langs, language);
+                language = ise_langs[0];
             }
         }
-        /* FIXME: Should support for all languages */
-        r = tts_add_text (_tts, str, "en_US", TTS_VOICE_TYPE_FEMALE, TTS_SPEED_NORMAL, &utt_id);
+        LOGD ("TTS language:%s, str:%s\n", language.c_str (), str);
+
+        r = tts_add_text (_tts, str, language.c_str (), TTS_VOICE_TYPE_AUTO, TTS_SPEED_AUTO, &utt_id);
         if (TTS_ERROR_NONE == r) {
             r = tts_play (_tts);
             if (TTS_ERROR_NONE != r) {
-                LOGW ("Fail to play TTS : ret(%d)\n", r);
+                LOGW ("Fail to play TTS : ret (%d)\n", r);
             }
         }
     }
@@ -1961,6 +2647,67 @@ static void ui_play_tts (const char* str)
 }
 
 /**
+ * @brief Show rect for candidate focus object when screen reader is enabled.
+ *
+ * @param x Rect X position.
+ * @param y Rect Y position.
+ * @param w Rect width.
+ * @param h Rect height.
+ */
+static void ui_tts_focus_rect_show (int x, int y, int w, int h)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+    if (_candidate_window == NULL || _candidate_state != WINDOW_STATE_SHOW)
+        return;
+
+    if (_tts_focus_rect == NULL) {
+        _tts_focus_rect = evas_object_rectangle_add (evas_object_evas_get((Evas_Object*)_candidate_window));
+        evas_object_color_set (_tts_focus_rect, 0, 0, 0, 0);
+        elm_access_highlight_set (elm_access_object_register (_tts_focus_rect, (Evas_Object*)_candidate_window));
+    }
+    evas_object_move (_tts_focus_rect, x, y);
+    evas_object_resize (_tts_focus_rect, w, h);
+    evas_object_raise (_tts_focus_rect);
+    evas_object_show (_tts_focus_rect);
+}
+
+/**
+ * @brief Hide rect for candidate focus object when screen reader is enabled.
+ */
+static void ui_tts_focus_rect_hide (void)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    if (_tts_focus_rect) {
+        //evas_object_hide (_tts_focus_rect);
+        evas_object_move (_tts_focus_rect, -1000, -1000);
+    }
+}
+
+/**
+ * @brief Callback function for candidate scroller stop event.
+ *
+ * @param data Data to pass when it is called.
+ * @param obj The evas object for current event.
+ * @param event_info The information for current event.
+ */
+static void ui_candidate_scroller_stop_cb (void *data, Evas_Object *obj, void *event_info)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+    if (!_wait_stop_event)
+        return;
+
+    if (_candidate_tts_focus_index >= 0 && _candidate_tts_focus_index < g_isf_candidate_table.get_current_page_size ()) {
+        if (_candidate_0 [_candidate_tts_focus_index]) {
+            int x, y, w, h;
+            evas_object_geometry_get (_candidate_0 [_candidate_tts_focus_index], &x, &y, &w, &h);
+            ui_tts_focus_rect_show (x, y, w, h);
+        }
+    }
+    _wait_stop_event = false;
+}
+
+/**
  * @brief Mouse over (find focus object and play text by TTS) when screen reader is enabled.
  *
  * @param mouse_x Mouse X position.
@@ -1981,6 +2728,8 @@ static void ui_mouse_over (int mouse_x, int mouse_y)
                 String mbs = utf8_wcstombs (g_isf_candidate_table.get_candidate_in_current_page (i));
                 SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " play candidate string: " << mbs << "\n";
                 ui_play_tts (mbs.c_str ());
+                _candidate_tts_focus_index = i;
+                ui_tts_focus_rect_show (x, y, width, height);
                 return;
             }
         }
@@ -1989,12 +2738,18 @@ static void ui_mouse_over (int mouse_x, int mouse_y)
     String strTts = String ("");
     if (_candidate_area_2_visible) {
         evas_object_geometry_get (_close_btn, &x, &y, &width, &height);
-        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height)
-            strTts = String ("close button");
+        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height) {
+            strTts = String (_("close button"));
+            _candidate_tts_focus_index = CLOSE_BUTTON_INDEX;
+            ui_tts_focus_rect_show (x, y, width, height);
+        }
     } else {
         evas_object_geometry_get (_more_btn, &x, &y, &width, &height);
-        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height)
-            strTts = String ("more button");
+        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height) {
+            strTts = String (_("more button"));
+            _candidate_tts_focus_index = MORE_BUTTON_INDEX;
+            ui_tts_focus_rect_show (x, y, width, height);
+        }
     }
     if (strTts.length () > 0)
         ui_play_tts (strTts.c_str ());
@@ -2003,39 +2758,38 @@ static void ui_mouse_over (int mouse_x, int mouse_y)
 /**
  * @brief Mouse click (find focus object and do click event) when screen reader is enabled.
  *
- * @param mouse_x Mouse X position.
- * @param mouse_y Mouse Y position.
+ * @param focus_index focused candidate index.
  */
-static void ui_mouse_click (int mouse_x, int mouse_y)
+static void ui_mouse_click (int focus_index)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-    if (_candidate_window == NULL || _candidate_state != WINDOW_STATE_SHOW)
+    if (_candidate_window == NULL || _candidate_state != WINDOW_STATE_SHOW || focus_index == INVALID_TTS_FOCUS_INDEX)
         return;
 
-    int x, y, width, height;
-    for (int i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; ++i) {
-        if (_candidate_0 [i]) {
-            evas_object_geometry_get (_candidate_0 [i], &x, &y, &width, &height);
-            if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height) {
-                Evas_Event_Mouse_Down event_info;
-                event_info.canvas.x = mouse_x;
-                event_info.canvas.y = mouse_y;
-                ui_mouse_button_pressed_cb (GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_0), NULL, NULL, &event_info);
-                ui_mouse_button_released_cb (GINT_TO_POINTER (i), NULL, NULL, &event_info);
-                return;
-            }
+    if (focus_index >= 0 && focus_index < g_isf_candidate_table.get_current_page_size ()) {
+        if (_candidate_0 [focus_index]) {
+            int x, y, width, height;
+            evas_object_geometry_get (_candidate_0 [focus_index], &x, &y, &width, &height);
+            Evas_Event_Mouse_Down event_info;
+            event_info.canvas.x = x + width / 2;
+            event_info.canvas.y = y + height / 2;
+            ui_mouse_button_pressed_cb (GINT_TO_POINTER ((focus_index << 8) + ISF_EFL_CANDIDATE_0), NULL, NULL, &event_info);
+            ui_mouse_button_released_cb (GINT_TO_POINTER (focus_index), NULL, NULL, &event_info);
         }
+        _candidate_tts_focus_index = INVALID_TTS_FOCUS_INDEX;
+        ui_tts_focus_rect_hide ();
+        return;
     }
 
     if (_candidate_area_2_visible) {
-        evas_object_geometry_get (_close_btn, &x, &y, &width, &height);
-        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height) {
+        if (focus_index == CLOSE_BUTTON_INDEX) {
             ui_candidate_window_close_button_cb (NULL, NULL, NULL, NULL);
+            _candidate_tts_focus_index = MORE_BUTTON_INDEX;
         }
     } else {
-        evas_object_geometry_get (_more_btn, &x, &y, &width, &height);
-        if (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height) {
+        if (focus_index == MORE_BUTTON_INDEX) {
             ui_candidate_window_more_button_cb (NULL, NULL, NULL, NULL);
+            _candidate_tts_focus_index = CLOSE_BUTTON_INDEX;
         }
     }
 }
@@ -2057,7 +2811,6 @@ static void ui_create_preedit_window (void)
 
         _preedit_text = edje_object_add (evas_object_evas_get (_preedit_window));
         edje_object_file_set (_preedit_text, _candidate_edje_file.c_str (), "preedit_text");
-        edje_object_text_class_set (_preedit_text, "preedit_text_class", _candidate_font_name.c_str (), preedit_font_size);
         evas_object_size_hint_fill_set (_preedit_text, EVAS_HINT_FILL, EVAS_HINT_FILL);
         evas_object_size_hint_weight_set (_preedit_text, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         elm_win_resize_object_add (_preedit_window, _preedit_text);
@@ -2078,12 +2831,12 @@ static void ui_create_native_candidate_window (void)
     _candidate_port_width        = _screen_width;
     _candidate_port_height_min   = 84 * _height_rate * _candidate_port_line;
     _candidate_port_height_min_2 = 84 * _height_rate + _candidate_port_height_min;
-    _candidate_port_height_max   = 444 * _height_rate + _candidate_port_height_min;
+    _candidate_port_height_max   = 426 * _height_rate + _candidate_port_height_min;
     _candidate_port_height_max_2 = 84 * _height_rate + _candidate_port_height_max;
     _candidate_land_width        = _screen_height;
     _candidate_land_height_min   = 84 * _width_rate;
     _candidate_land_height_min_2 = 168 * _width_rate;
-    _candidate_land_height_max   = 316 * _width_rate + _candidate_land_height_min;
+    _candidate_land_height_max   = 342 * _width_rate;
     _candidate_land_height_max_2 = 426 * _width_rate;
 
     _candidate_scroll_0_width_min= _screen_width;
@@ -2129,11 +2882,18 @@ static void ui_create_native_candidate_window (void)
         ecore_x_e_window_rotation_geometry_set (elm_win_xwindow_get (_candidate_window),
                 270, 0, 0, _candidate_land_height_min, _candidate_land_width);
 
-        /* Add background */
+        /* Add dim background */
+        Evas_Object *dim_bg = elm_bg_add (_candidate_window);
+        evas_object_color_set (dim_bg, 0, 0, 0, 153);
+        elm_win_resize_object_add (_candidate_window, dim_bg);
+        evas_object_show (dim_bg);
+
+        /* Add candidate background */
         _candidate_bg = edje_object_add (evas_object_evas_get (_candidate_window));
         edje_object_file_set (_candidate_bg, _candidate_edje_file.c_str (), "candidate_bg");
         evas_object_size_hint_weight_set (_candidate_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_win_resize_object_add (_candidate_window, _candidate_bg);
+        evas_object_resize (_candidate_bg, _candidate_port_width, _candidate_port_height_min);
+        evas_object_move (_candidate_bg, 0, 0);
         evas_object_show (_candidate_bg);
 
         /* Create _candidate_0 scroller */
@@ -2183,6 +2943,7 @@ static void ui_create_native_candidate_window (void)
         elm_object_content_set (_candidate_scroll, _candidate_table);
         evas_object_show (_candidate_table);
         _candidate_area_2 = _candidate_scroll;
+        evas_object_smart_callback_add (_candidate_scroll, "scroll,anim,stop", ui_candidate_scroller_stop_cb, NULL);
 
         /* Create close button */
         _close_btn = edje_object_add (evas_object_evas_get (_candidate_window));
@@ -2218,6 +2979,8 @@ static void ui_create_native_candidate_window (void)
 
         _tmp_aux_text = evas_object_text_add (evas_object_evas_get (_candidate_window));
         evas_object_text_font_set (_tmp_aux_text, _candidate_font_name.c_str (), _aux_font_size);
+    } else {
+        evas_object_hide (_candidate_window);
     }
 
     flush_memory ();
@@ -2232,8 +2995,8 @@ static void ui_create_candidate_window (void)
 {
     check_time ("\nEnter ui_create_candidate_window");
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    ui_destroy_candidate_window ();
+    if (_candidate_mode == SOFT_CANDIDATE_WINDOW)
+        return;
 
     _candidate_x     = 0;
     _candidate_y     = 0;
@@ -2246,7 +3009,7 @@ static void ui_create_candidate_window (void)
             ECORE_X_ATOM_E_WINDOW_ROTATION_SUPPORTED,
             &set, 1);
 
-    int angle = efl_get_angle_for_app_window ();
+    int angle = efl_get_app_window_angle ();
     if (_candidate_angle != angle) {
         _candidate_angle = angle;
         ui_candidate_window_rotate (angle);
@@ -2254,6 +3017,8 @@ static void ui_create_candidate_window (void)
         ui_settle_candidate_window ();
     }
 
+    candidate_expanded = false;
+
     check_time ("Exit ui_create_candidate_window");
 }
 
@@ -2273,11 +3038,6 @@ static void ui_destroy_candidate_window (void)
             evas_object_del (_candidate_0 [i]);
             _candidate_0 [i] = NULL;
         }
-        if (_candidate_items [i]) {
-            evas_object_del (_candidate_items [i]);
-            _candidate_items [i] = NULL;
-        }
-
         if (_seperate_0 [i]) {
             evas_object_del (_seperate_0 [i]);
             _seperate_0 [i] = NULL;
@@ -2286,7 +3046,6 @@ static void ui_destroy_candidate_window (void)
             evas_object_del (_seperate_items [i]);
             _seperate_items [i] = NULL;
         }
-
         if (_line_0 [i]) {
             evas_object_del (_line_0 [i]);
             _line_0 [i] = NULL;
@@ -2310,6 +3069,7 @@ static void ui_destroy_candidate_window (void)
         _candidate_area_1 = NULL;
         _candidate_area_2 = NULL;
         _scroller_bg      = NULL;
+        _tts_focus_rect   = NULL;
     }
 
     if (_preedit_window) {
@@ -2344,7 +3104,6 @@ static void ui_settle_candidate_window (void)
     int x, y, width, height;
     int pos_x = 0, pos_y = 0, ise_width = 0, ise_height = 0;
     bool get_geometry_result = false;
-    bool reverse = false;
 
     /* Get candidate window position */
     ecore_evas_geometry_get (ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window)), &x, &y, &width, &height);
@@ -2355,7 +3114,7 @@ static void ui_settle_candidate_window (void)
         get_geometry_result = ecore_x_e_window_rotation_geometry_get (_ise_window, _candidate_angle, &pos_x, &pos_y, &ise_width, &ise_height);
 
     if ((_ise_state != WINDOW_STATE_SHOW && _ise_state != WINDOW_STATE_WILL_HIDE) ||
-            get_geometry_result == false) {
+            (get_geometry_result == false) || (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE)) {
         ise_height = 0;
         ise_width = 0;
     }
@@ -2392,34 +3151,31 @@ static void ui_settle_candidate_window (void)
         int nOffset = _candidate_port_height_min / 3;
         if (_candidate_angle == 270) {
             if (ise_rect.height > 0 && spot_y + height2 > _screen_width - (int)ise_rect.height + nOffset) {
-                reverse = true;
                 spot_x = _screen_width - _spot_location_top_y - (_candidate_height - height2);
             } else {
                 spot_x = _screen_width - _spot_location_y - _candidate_height;
             }
         } else if (_candidate_angle == 90) {
             if (ise_rect.height > 0 && spot_y + height2 > _screen_width - (int)ise_rect.height + nOffset) {
-                reverse = true;
                 spot_x = _spot_location_top_y - height2;
             } else {
                 spot_x = spot_y;
             }
         } else if (_candidate_angle == 180) {
             if (ise_rect.height > 0 && spot_y + height2 > _screen_height - (int)ise_rect.height + nOffset) {
-                reverse = true;
                 spot_y = _screen_height - _spot_location_top_y - (_candidate_height - height2);
             } else {
                 spot_y = _screen_height - _spot_location_y - _candidate_height;
             }
         } else {
             if (ise_rect.height > 0 && spot_y + height2 > _screen_height - (int)ise_rect.height + nOffset) {
-                reverse = true;
                 spot_y = _spot_location_top_y - height2;
             } else {
                 spot_y = spot_y;
             }
         }
     }
+
     if (_candidate_angle == 90) {
         spot_y = (_screen_height - _candidate_width) / 2;
         spot_x = spot_x < _indicator_height ? _indicator_height : spot_x;
@@ -2487,14 +3243,7 @@ static void efl_set_transient_for_app_window (Ecore_X_Window window)
     LOGD ("win : %x, forwin : %x\n", window, xAppWindow);
 }
 
-/**
- * @brief Get angle for app window.
- *
- * @param win_obj The Evas_Object handler of application window.
- *
- * @return The angle of app window.
- */
-static int efl_get_angle_for_app_window ()
+static int efl_get_window_rotate_angle (Ecore_X_Window win)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
@@ -2503,20 +3252,33 @@ static int efl_get_angle_for_app_window ()
     int angle = 0;
     unsigned char *prop_data = NULL;
 
-    Ecore_X_Window app_window = efl_get_app_window ();
-    ret = ecore_x_window_prop_property_get (app_window,
+    ret = ecore_x_window_prop_property_get (win,
             ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE, ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count);
     if (ret && prop_data) {
         memcpy (&angle, prop_data, sizeof (int));
-        LOGD ("WINDOW angle for APP %p is %d", app_window, angle);
+        LOGD ("WINDOW angle of %p is %d", win, angle);
     } else {
         std::cerr << "ecore_x_window_prop_property_get () is failed!!!\n";
-        LOGD ("WINDOW angle for APP %p FAILED!", app_window);
+        LOGW ("WINDOW angle of %p FAILED!", win);
     }
     if (prop_data)
         XFree (prop_data);
 
-    return angle;
+    return angle;
+}
+
+/**
+ * @brief Get angle for app window.
+ *
+ * @param win_obj The Evas_Object handler of application window.
+ *
+ * @return The angle of app window.
+ */
+static int efl_get_app_window_angle ()
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    return efl_get_window_rotate_angle (efl_get_app_window ());
 }
 
 /**
@@ -2526,28 +3288,23 @@ static int efl_get_angle_for_app_window ()
  *
  * @return The angle of ise window.
  */
-static int efl_get_angle_for_ise_window ()
+static int efl_get_ise_window_angle ()
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    int ret;
-    int count;
-    int angle = 0;
-    unsigned char *prop_data = NULL;
+    return efl_get_window_rotate_angle (_ise_window);
+}
 
-    ret = ecore_x_window_prop_property_get (_ise_window,
-            ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE, ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count);
-    if (ret && prop_data) {
-        memcpy (&angle, prop_data, sizeof (int));
-        LOGD ("WINDOW angle for ISE %p is %d", _ise_window, angle);
-    } else {
-        std::cerr << "ecore_x_window_prop_property_get () is failed!!!\n";
-        LOGD ("WINDOW angle for ISE %p FAILED!", _ise_window);
-    }
-    if (prop_data)
-        XFree (prop_data);
+/**
+ * @brief Get angle of quickpanel window.
+ *
+ * @return The angle of quickpanel window.
+ */
+static int efl_get_quickpanel_window_angle ()
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    return angle;
+    return efl_get_window_rotate_angle (efl_get_quickpanel_window ());
 }
 
 /**
@@ -2644,7 +3401,6 @@ static Ecore_X_Window efl_get_app_window (void)
             xAppWindow = *(Window *)data;
             if (data)
                 XFree (data);
-            _app_window = xAppWindow;
         }
     } else {
         std::cerr << "XGetWindowProperty () is failed!!!\n";
@@ -2652,6 +3408,18 @@ static Ecore_X_Window efl_get_app_window (void)
 
     return xAppWindow;
 }
+
+static Ecore_X_Window efl_get_quickpanel_window (void)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    Ecore_X_Window rootWin = ecore_x_window_root_first_get ();
+    Ecore_X_Window qpwin;
+    ecore_x_window_prop_xid_get (rootWin, ecore_x_atom_get ("_E_ILLUME_QUICKPANEL_WINDOW_LIST"), ECORE_X_ATOM_WINDOW, &qpwin, 1);
+
+    return qpwin;
+}
+
 /**
  * @brief Get default zone geometry.
  *
@@ -2747,6 +3515,11 @@ static bool initialize_panel_agent (const String &config, const String &display,
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s, initializing panel agent\n",
+        time (0), getpid (), __FILE__, __func__);
+    isf_save_log (buf);
+
     _panel_agent = new PanelAgent ();
 
     if (!_panel_agent || !_panel_agent->initialize (config, display, resident))
@@ -2795,12 +3568,18 @@ static bool initialize_panel_agent (const String &config, const String &display,
 
     _panel_agent->signal_connect_will_hide_ack              (slot (slot_will_hide_ack));
 
+    _panel_agent->signal_connect_set_hardware_keyboard_mode (slot (slot_set_hardware_keyboard_mode));
+
     _panel_agent->signal_connect_candidate_will_hide_ack    (slot (slot_candidate_will_hide_ack));
     _panel_agent->signal_connect_get_ise_state              (slot (slot_get_ise_state));
 
     std::vector<String> load_ise_list;
     _panel_agent->get_active_ise_list (load_ise_list);
 
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s, initializing panel agent succeeded\n",
+        time (0), getpid (), __FILE__, __func__);
+    isf_save_log (buf);
+
     return true;
 }
 
@@ -2886,6 +3665,16 @@ static void slot_set_candidate_style (int portrait_line, int mode)
     }
 }
 
+unsigned int get_ise_size (TOOLBAR_MODE_T mode)
+{
+    unsigned int ise_count = 0;
+    for (unsigned int i = 0; i < _uuids.size (); i++) {
+        if (mode == _modes[i]) ise_count++;
+    }
+
+    return ise_count;
+}
+
 /**
  * @brief Update keyboard ISE information slot function for PanelAgent.
  *
@@ -2897,11 +3686,11 @@ static void slot_update_factory_info (const PanelFactoryInfo &info)
 
     String ise_name = info.name;
     String ise_icon = info.icon;
+    unsigned int keyboard_ise_count = 0;
 
     String old_ise = _panel_agent->get_current_ise_name ();
     if (old_ise != ise_name) {
-        int hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
-        if (hw_kbd_detect && _candidate_window) {
+        if ((_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) && _candidate_window) {
             ui_destroy_candidate_window ();
         }
     }
@@ -2913,6 +3702,27 @@ static void slot_update_factory_info (const PanelFactoryInfo &info)
 
     if (ise_name.length () > 0)
         _panel_agent->set_current_ise_name (ise_name);
+
+    if (old_ise != ise_name) {
+        if (TOOLBAR_KEYBOARD_MODE == mode) {
+            char noti_msg[256] = {0};
+            keyboard_ise_count = get_ise_size (TOOLBAR_KEYBOARD_MODE);
+            if (keyboard_ise_count == 0) {
+                LOGD ("the number of keyboard ise is %d\n", keyboard_ise_count);
+                return;
+            }
+            else if (keyboard_ise_count >= 2) {
+                snprintf (noti_msg, sizeof (noti_msg), _("%s selected"), ise_name.c_str ());
+           }
+            else if (keyboard_ise_count == 1) {
+                snprintf (noti_msg, sizeof (noti_msg), _("Only %s is available"), ise_name.c_str ());
+            }
+
+            notification_status_message_post (noti_msg);
+            LOGD ("%s\n", noti_msg);
+        }
+    }
+
 }
 
 /**
@@ -2957,26 +3767,21 @@ static void slot_update_ise_geometry (int x, int y, int width, int height)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " x:" << x << " y:" << y << " width:" << width << " height:" << height << "...\n";
 
-    LOGD ("x : %d , y : %d , width : %d , height : %d", x, y, width, height);
+    LOGD ("x : %d , y : %d , width : %d , height : %d, _ise_state : %d", x, y, width, height, _ise_state);
 
-    int hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
-    if (hw_kbd_detect)
+    if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE)
         return;
 
-    int old_height = _ise_height;
-
     _ise_width  = width;
     _ise_height = height;
 
     if (_candidate_window && _candidate_state == WINDOW_STATE_SHOW) {
-        if (old_height != height) {
-            ui_settle_candidate_window ();
-        }
+        ui_settle_candidate_window ();
     }
 
-    if (old_height != height && _ise_state == WINDOW_STATE_SHOW) {
+    if (_ise_state == WINDOW_STATE_SHOW) {
         _ise_reported_geometry.valid = true;
-        _ise_reported_geometry.angle = efl_get_angle_for_ise_window ();
+        _ise_reported_geometry.angle = efl_get_ise_window_angle ();
         _ise_reported_geometry.geometry.pos_x = x;
         _ise_reported_geometry.geometry.pos_y = y;
         _ise_reported_geometry.geometry.width = width;
@@ -2994,7 +3799,7 @@ static void slot_show_preedit_string (void)
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
     if (_preedit_window == NULL) {
         ui_create_preedit_window ();
-        int angle = efl_get_angle_for_app_window ();
+        int angle = efl_get_app_window_angle ();
         elm_win_rotation_with_resize_set (_preedit_window, angle);
 
         /* Move preedit window according to candidate window position */
@@ -3045,6 +3850,7 @@ static void slot_show_aux_string (void)
     LOGD ("calling ui_candidate_show ()");
     ui_candidate_show ();
     ui_settle_candidate_window ();
+    ui_candidate_delete_destroy_timer ();
 }
 
 /**
@@ -3076,6 +3882,7 @@ static void slot_show_candidate_table (void)
     LOGD ("calling ui_candidate_show ()");
     ui_candidate_show ();
     ui_settle_candidate_window ();
+    ui_candidate_delete_destroy_timer ();
 
 #if HAVE_FEEDBACK
     feedback_result = feedback_initialize ();
@@ -3124,7 +3931,7 @@ static void slot_hide_aux_string (void)
 
     if (ui_candidate_can_be_hide ()) {
         _candidate_show_requested = false;
-        LOGD ("setting _show_can didate_requested to FALSE");
+        LOGD ("setting _show_candidate_requested to FALSE");
     }
 }
 
@@ -3347,7 +4154,6 @@ static void slot_update_aux_string (const String &str, const AttributeList &attr
         count++;
         aux_edje = edje_object_add (evas);
         edje_object_file_set (aux_edje, _candidate_edje_file.c_str (), "aux");
-        edje_object_text_class_set (aux_edje, "aux_text_class", _candidate_font_name.c_str (), _aux_font_size);
         edje_object_part_text_set (aux_edje, "aux", aux_list [i].c_str ());
         elm_table_pack (_aux_table, aux_edje, 2 * i, 0, 1, 1);
         evas_object_event_callback_add (aux_edje, EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_AUX));
@@ -3413,12 +4219,11 @@ static void update_table (int table_type, const LookupTable &table)
     WideString wcs;
 
     AttributeList attrs;
-    int i, x, y, width, height, item_0_width = 0;
+    int i, x, y, item_0_width = 0;
 
-    int nLast      = 0;
-    std::vector<uint32> row_items;
+    int nLast = 0;
 
-    int seperate_width  = 4;
+    int seperate_width  = 2;
     int seperate_height = 52 * _height_rate;
     int line_width      = _candidate_scroll_width;
     int line_height     = _v_padding;
@@ -3436,6 +4241,12 @@ static void update_table (int table_type, const LookupTable &table)
     else
         scroll_0_width = 618 * _width_rate;
 
+    _candidate_image_count = 0;
+    _candidate_text_count = 0;
+    _candidate_pop_image_count = 0;
+    _candidate_display_number = 0;
+    _candidate_row_items.clear ();
+
     Evas *evas = evas_object_evas_get (_candidate_window);
     for (i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; ++i) {
         if (_candidate_0 [i]) {
@@ -3446,19 +4257,21 @@ static void update_table (int table_type, const LookupTable &table)
             evas_object_del (_seperate_0 [i]);
             _seperate_0 [i] = NULL;
         }
-        if (_candidate_items [i]) {
-            evas_object_del (_candidate_items [i]);
-            _candidate_items [i] = NULL;
-        }
         if (_seperate_items [i]) {
             evas_object_del (_seperate_items [i]);
             _seperate_items [i] = NULL;
         }
+        if (_line_0 [i]) {
+            evas_object_del (_line_0 [i]);
+            _line_0 [i] = NULL;
+        }
         if (_line_items [i]) {
             evas_object_del (_line_items [i]);
             _line_items [i] = NULL;
         }
+    }
 
+    for (i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; ++i) {
         if (i < item_num) {
             bool   bHighLight  = false;
             bool   bSetBack    = false;
@@ -3482,24 +4295,13 @@ static void update_table (int table_type, const LookupTable &table)
             mbs = utf8_wcstombs (wcs);
 
             if (!_candidate_0 [i] && total_width <= scroll_0_width) {
-                _candidate_0 [i] = edje_object_add (evas);
-                edje_object_file_set (_candidate_0 [i], _candidate_edje_file.c_str (), _candidate_name.c_str ());
-                edje_object_text_class_set (_candidate_0 [i], "candidate_text_class", _candidate_font_name.c_str (), _candidate_font_size);
+                _candidate_0 [i] = get_candidate (mbs, _candidate_window, &item_0_width, nForeGround, nBackGround, bHighLight, bSetBack, item_num, i);
                 evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_0));
                 evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_UP, ui_mouse_button_released_cb, GINT_TO_POINTER (i));
                 evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_MOVE, ui_mouse_moved_cb, GINT_TO_POINTER (ISF_EFL_CANDIDATE_0));
-                evas_object_show (_candidate_0 [i]);
 
-                edje_object_part_text_set (_candidate_0 [i], "candidate", mbs.c_str ());
                 /* Resize _candidate_0 [i] display width */
-                evas_object_text_text_set (_tmp_candidate_text, mbs.c_str ());
-                evas_object_geometry_get (_tmp_candidate_text, &x, &y, &width, &height);
-                item_0_width = width + 2*_blank_width;
                 item_0_width = item_0_width > _item_min_width ? item_0_width : _item_min_width;
-                evas_object_size_hint_min_set (_candidate_0 [i], item_0_width, _item_min_height);
-                if (bHighLight || bSetBack) {
-                    set_highlight_color (_candidate_0 [i], nForeGround, nBackGround, bSetBack);
-                }
 
                 /* Check whether this item is the last one */
                 if (i == item_num - 1) {
@@ -3512,9 +4314,11 @@ static void update_table (int table_type, const LookupTable &table)
                 /* Add first item */
                 if (i == 0) {
                     item_0_width = item_0_width > scroll_0_width ? scroll_0_width : item_0_width;
+                    evas_object_show (_candidate_0 [i]);
                     evas_object_size_hint_min_set (_candidate_0 [i], item_0_width, _item_min_height);
                     elm_table_pack (_candidate_0_table, _candidate_0 [i], 0, 0, item_0_width, _item_min_height);
                     total_width += item_0_width;
+                    _candidate_display_number++;
                     continue;
                 } else {
                     total_width += (item_0_width + seperate_width);
@@ -3523,56 +4327,49 @@ static void update_table (int table_type, const LookupTable &table)
                         edje_object_file_set (_seperate_0 [i], _candidate_edje_file.c_str (), "seperate_line");
                         evas_object_size_hint_min_set (_seperate_0 [i], seperate_width, seperate_height);
                         elm_table_pack (_candidate_0_table, _seperate_0 [i],
-                                        total_width - item_0_width - seperate_width,
-                                        line_0*(_item_min_height+line_height) + (_item_min_height - seperate_height)/2,
-                                        seperate_width, seperate_height);
+                                total_width - item_0_width - seperate_width,
+                                line_0*(_item_min_height+line_height) + (_item_min_height - seperate_height)/2,
+                                seperate_width, seperate_height);
                         evas_object_show (_seperate_0 [i]);
-
+                        evas_object_show (_candidate_0 [i]);
+                        evas_object_size_hint_min_set (_candidate_0 [i], item_0_width, _item_min_height);
                         elm_table_pack (_candidate_0_table, _candidate_0 [i], total_width - item_0_width, line_0*(_item_min_height+line_height), item_0_width, _item_min_height);
+                        _candidate_display_number++;
                         continue;
                     } else if ((_candidate_angle == 0 || _candidate_angle == 180) &&
-                               (_candidate_port_line > 1 && (line_0 + 1) < _candidate_port_line)) {
+                            (_candidate_port_line > 1 && (line_0 + 1) < _candidate_port_line)) {
                         line_0++;
                         scroll_0_width = _candidate_scroll_0_width_min;
                         item_0_width = item_0_width > scroll_0_width ? scroll_0_width : item_0_width;
+                        evas_object_show (_candidate_0 [i]);
                         evas_object_size_hint_min_set (_candidate_0 [i], item_0_width, _item_min_height);
                         elm_table_pack (_candidate_0_table, _candidate_0 [i], 0, line_0*(_item_min_height+line_height), item_0_width, _item_min_height);
                         total_width = item_0_width;
+                        _candidate_display_number++;
 
-                        row_items.push_back (i - nLast);
+                        _candidate_row_items.push_back (i - nLast);
                         nLast = i;
                         continue;
                     } else {
-                        row_items.push_back (i - nLast);
+                        _candidate_row_items.push_back (i - nLast);
                         nLast = i;
                     }
                 }
             }
 
-            if (!_candidate_items [i]) {
-                _candidate_items [i] = edje_object_add (evas);
-                edje_object_file_set (_candidate_items [i], _candidate_edje_file.c_str (), _candidate_name.c_str ());
-                edje_object_text_class_set (_candidate_items [i], "candidate_text_class", _candidate_font_name.c_str (), _candidate_font_size);
-                evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_ITEMS));
-                evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_UP, ui_mouse_button_released_cb, GINT_TO_POINTER (i));
-                evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_MOVE, ui_mouse_moved_cb, GINT_TO_POINTER (ISF_EFL_CANDIDATE_ITEMS));
-                evas_object_show (_candidate_items [i]);
-            }
-            if (bHighLight || bSetBack) {
-                set_highlight_color (_candidate_items [i], nForeGround, nBackGround, bSetBack);
+            if (!_candidate_0 [i]) {
+                _candidate_0 [i] = get_candidate (mbs, _candidate_window, &item_0_width, nForeGround, nBackGround, bHighLight, bSetBack, item_num, i);
+                evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_ITEMS));
+                evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_UP, ui_mouse_button_released_cb, GINT_TO_POINTER (i));
+                evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_MOVE, ui_mouse_moved_cb, GINT_TO_POINTER (ISF_EFL_CANDIDATE_ITEMS));
             }
-            edje_object_part_text_set (_candidate_items [i], "candidate", mbs.c_str ());
             /* Resize _candidate_items [i] display width */
-            evas_object_text_text_set (_tmp_candidate_text, mbs.c_str ());
-            evas_object_geometry_get (_tmp_candidate_text, &x, &y, &width, &height);
-            item_0_width = width + 2*_blank_width;
             item_0_width = item_0_width > _item_min_width ? item_0_width : _item_min_width;
-            evas_object_size_hint_min_set (_candidate_items [i], item_0_width, _item_min_height);
             if (current_width > 0 && current_width + item_0_width > _candidate_scroll_width) {
                 current_width = 0;
                 line_count++;
 
-                row_items.push_back (i - nLast);
+                _candidate_row_items.push_back (i - nLast);
                 nLast = i;
                 if (cursor_pos >= i)
                     cursor_line++;
@@ -3598,9 +4395,15 @@ static void update_table (int table_type, const LookupTable &table)
             }
             x = current_width;
             y = line_count*(_item_min_height+line_height) + line_height;
-            elm_table_pack (_candidate_table, _candidate_items [i], x, y, item_0_width, _item_min_height);
+            evas_object_size_hint_min_set (_candidate_0 [i], item_0_width, _item_min_height);
+            evas_object_show (_candidate_0 [i]);
+            elm_table_pack (_candidate_table, _candidate_0 [i], x, y, item_0_width, _item_min_height);
             current_width += item_0_width;
             more_item_count++;
+            if (candidate_expanded == false && !bHighLight)
+                break;
+            else
+                candidate_expanded = true;
         }
     }
 
@@ -3624,7 +4427,7 @@ static void update_table (int table_type, const LookupTable &table)
                 edje_object_file_set (_seperate_0 [nIndex], _candidate_edje_file.c_str (), "seperate_line");
                 evas_object_size_hint_min_set (_seperate_0 [nIndex], seperate_width, _item_min_height);
                 elm_table_pack (_candidate_0_table, _seperate_0 [nIndex],
-                                0, i*(_item_min_height+line_height), seperate_width, _item_min_height);
+                        0, i*(_item_min_height+line_height), seperate_width, _item_min_height);
             }
         } else if (_line_0 [i]) {
             evas_object_del (_line_0 [i]);
@@ -3632,9 +4435,9 @@ static void update_table (int table_type, const LookupTable &table)
         }
     }
 
-    row_items.push_back (item_num - nLast);     /* Add the number of last row */
-    _panel_agent->update_candidate_item_layout (row_items);
-    _panel_agent->update_displayed_candidate_number (item_num - more_item_count);
+    _candidate_row_items.push_back (item_num - nLast);     /* Add the number of last row */
+    _panel_agent->update_displayed_candidate_number (_candidate_display_number);
+    _panel_agent->update_candidate_item_layout (_candidate_row_items);
     if (more_item_count == 0) {
         ui_candidate_window_close_button_cb (NULL, NULL, NULL, NULL);
         evas_object_hide (_more_btn);
@@ -3653,9 +4456,9 @@ static void update_table (int table_type, const LookupTable &table)
     int line_h   = _item_min_height + _v_padding;
     int cursor_y = cursor_line * line_h;
     if (cursor_y < y) {
-        elm_scroller_region_show (_candidate_area_2, 0, cursor_y, w, h);
+        elm_scroller_region_bring_in (_candidate_area_2, 0, cursor_y, w, h);
     } else if (cursor_y >= y + h) {
-        elm_scroller_region_show (_candidate_area_2, 0, cursor_y + line_h - h, w, h);
+        elm_scroller_region_bring_in (_candidate_area_2, 0, cursor_y + line_h - h, w, h);
     }
 
     flush_memory ();
@@ -3670,7 +4473,7 @@ static void slot_update_candidate_table (const LookupTable &table)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    if (_candidate_mode == SOFT_CANDIDATE_WINDOW){
+    if (_candidate_mode == SOFT_CANDIDATE_WINDOW) {
         _panel_agent->update_helper_lookup_table (table);
         return ;
     }
@@ -3681,7 +4484,15 @@ static void slot_update_candidate_table (const LookupTable &table)
     if (!_candidate_window || table.get_current_page_size () < 0)
         return;
 
+    if (evas_object_visible_get (_candidate_area_2)) {
+        candidate_expanded = true;
+    } else {
+        candidate_expanded = false;
+    }
+
     update_table (ISF_CANDIDATE_TABLE, table);
+    _candidate_tts_focus_index = INVALID_TTS_FOCUS_INDEX;
+    ui_tts_focus_rect_hide ();
 }
 
 /**
@@ -3744,8 +4555,7 @@ static void slot_get_candidate_geometry (struct rectinfo &info)
  */
 static void slot_get_input_panel_geometry (struct rectinfo &info)
 {
-    int hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
-    if (hw_kbd_detect) {
+    if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
         info.pos_x = 0;
         info.width = 0;
         info.height = 0;
@@ -3753,7 +4563,7 @@ static void slot_get_input_panel_geometry (struct rectinfo &info)
             info.width  = _candidate_width;
             info.height = _candidate_height;
         }
-        int angle = efl_get_angle_for_app_window ();
+        int angle = efl_get_app_window_angle ();
         if (angle == 90 || angle == 270)
             info.pos_y = _screen_width - info.height;
         else
@@ -3789,7 +4599,7 @@ static void slot_get_input_panel_geometry (struct rectinfo &info)
  * @brief Set active ISE slot function for PanelAgent.
  *
  * @param uuid The active ISE's uuid.
- * @param changeDefault The flag for changeing default ISE.
+ * @param changeDefault The flag for changing default ISE.
  */
 static void slot_set_active_ise (const String &uuid, bool changeDefault)
 {
@@ -3820,13 +4630,12 @@ static bool slot_get_ise_list (std::vector<String> &list)
     if (ret && _initial_ise_uuid.length () > 0) {
         String active_uuid   = _initial_ise_uuid;
         String default_uuid  = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), String (""));
-        int    hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
         if (std::find (_uuids.begin (), _uuids.end (), default_uuid) == _uuids.end ()) {
-            if (hw_kbd_detect && _modes[get_ise_index (_initial_ise_uuid)] != TOOLBAR_KEYBOARD_MODE) {
+            if ((_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) && (_modes[get_ise_index (_initial_ise_uuid)] != TOOLBAR_KEYBOARD_MODE)) {
                 active_uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
             }
             set_active_ise (active_uuid);
-        } else if (!hw_kbd_detect) {    // Check whether keyboard engine is installed
+        } else if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) {    // Check whether keyboard engine is installed
             String IMENGINE_KEY  = String (SCIM_CONFIG_DEFAULT_IMENGINE_FACTORY) + String ("/") + String ("~other");
             String keyboard_uuid = _config->read (IMENGINE_KEY, String (""));
             if (std::find (_uuids.begin (), _uuids.end (), keyboard_uuid) == _uuids.end ()) {
@@ -3853,7 +4662,7 @@ static bool slot_get_ise_list (std::vector<String> &list)
  *
  * @return true if this operation is successful, otherwise return false.
  */
-static bool slot_get_ise_information (String uuid, String &name, String &language, int &type, int &option)
+static bool slot_get_ise_information (String uuid, String &name, String &language, int &type, int &option, String &module_name)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
@@ -3864,6 +4673,7 @@ static bool slot_get_ise_information (String uuid, String &name, String &languag
                 language = _langs[i];
                 type     = _modes[i];
                 option   = _options[i];
+                module_name = _module_names[i];
                 return true;
             }
         }
@@ -4062,7 +4872,11 @@ static void slot_close_connection (int fd)
  */
 static void slot_exit (void)
 {
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+    std::cerr << __FUNCTION__ << "...\n";
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s\n",
+        time (0), getpid (), __FILE__, __func__);
+    isf_save_log (buf);
 
     elm_exit ();
 }
@@ -4078,6 +4892,15 @@ static void slot_register_helper_properties (int id, const PropertyList &props)
         Ecore_X_Window xwindow = atoi (prop.get_key ().c_str ());
         _ise_window = xwindow;
         LOGD ("ISE XID : %x\n", _ise_window);
+
+        /* Just in case for the helper sent this message later than show_ise request */
+        if (_ise_state == WINDOW_STATE_SHOW || _ise_state == WINDOW_STATE_WILL_SHOW) {
+            efl_set_transient_for_app_window (_ise_window);
+        }
+
+        if (delete_ise_launch_timer ()) {
+            destroy_ise_selector ();
+        }
     }
 }
 
@@ -4085,22 +4908,42 @@ static void slot_show_ise (void)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
+    /* If the current toolbar mode is not HELPER_MODE, do not proceed */
+    if (_panel_agent->get_current_toolbar_mode () != TOOLBAR_HELPER_MODE) {
+        LOGD ("Current toolbar mode should be TOOBAR_HELPER_MODE but is %d, returning",
+            _panel_agent->get_current_toolbar_mode ());
+        return;
+    }
+
     /* WMSYNC, #3 Clear the existing application's conformant area and set transient_for */
     // Unset conformant area
     Ecore_X_Window current_app_window = efl_get_app_window ();
     if (_app_window != current_app_window) {
-        _app_window = current_app_window;
-        set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
+        struct rectinfo info = {0, 0, 0, 0};
+        info.pos_y = _screen_width > _screen_height ? _screen_width : _screen_height;
+        set_keyboard_geometry_atom_info (_app_window, info);
+        ecore_x_event_mask_unset (_app_window, ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE);
         LOGD ("Conformant reset for window %x\n", _app_window);
+        _app_window = current_app_window;
+
+        /* If the target window has changed but our ISE is still in visible state,
+           update the keyboard geometry information */
+        if (_ise_state == WINDOW_STATE_SHOW) {
+            set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
+        }
     }
 
     /* If the candidate was already in SHOW state, respect the current angle */
     if (_candidate_state != WINDOW_STATE_SHOW) {
         /* FIXME : Need to check if candidate_angle and window_angle should be left as separated */
-        _candidate_angle = efl_get_angle_for_app_window ();
-        _window_angle = efl_get_angle_for_app_window ();
+        _candidate_angle = efl_get_app_window_angle ();
+    }
+    /* If the ise was already in SHOW state, respect the current angle */
+    if (_ise_state != WINDOW_STATE_SHOW) {
+        _ise_angle = efl_get_app_window_angle ();
     }
 
+    ecore_x_event_mask_set (_app_window, ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE);
     efl_set_transient_for_app_window (_ise_window);
 
     /* If our ISE was already in SHOW state, skip state transition to WILL_SHOW */
@@ -4117,12 +4960,15 @@ static void slot_hide_ise (void)
     if (_ise_state != WINDOW_STATE_HIDE) {
         /* From this point, slot_get_input_panel_geometry should return hidden state geometry */
         _ise_state = WINDOW_STATE_WILL_HIDE;
+
+        _updated_hide_state_geometry = false;
     }
-    _window_angle = -1;
+    _ise_angle = -1;
+
+    ecore_x_event_mask_unset (_app_window, ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE);
 
     if (_candidate_window) {
-        int hw_kbd_detect = _config->read (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
-        if (hw_kbd_detect)
+        if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE)
             ui_candidate_hide (true, true, true);
     }
 }
@@ -4135,7 +4981,7 @@ static void slot_will_hide_ack (void)
     // WILL_HIDE_REQUEST_DONE Ack to WM
     Ecore_X_Window root_window = ecore_x_window_root_get (_control_window);
     ecore_x_e_virtual_keyboard_off_prepare_done_send (root_window, _control_window);
-    LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send(%x, %x)\n",
+    LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)\n",
             root_window, _control_window);
     if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) {
         LOGD ("calling ui_candidate_hide (true, false)");
@@ -4149,7 +4995,7 @@ static void slot_will_hide_ack (void)
     }
 
     if (_off_prepare_done_timer) {
-        ecore_timer_del(_off_prepare_done_timer);
+        ecore_timer_del (_off_prepare_done_timer);
         _off_prepare_done_timer = NULL;
     }
 }
@@ -4164,10 +5010,16 @@ static void slot_candidate_will_hide_ack (void)
     }
 }
 
+static void slot_set_hardware_keyboard_mode (void)
+{
+    LOGD ("slot_set_hardware_keyboard_mode called");
+    check_hardware_keyboard (HARDWARE_KEYBOARD_MODE);
+}
+
 static void slot_get_ise_state (int &state)
 {
     if (_ise_state == WINDOW_STATE_SHOW ||
-        (hw_kbd_mode && _candidate_state == WINDOW_STATE_SHOW)) {
+        ((_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) && (_candidate_state == WINDOW_STATE_SHOW))) {
         state = ECORE_IMF_INPUT_PANEL_STATE_SHOW;
     } else {
         /* Currently we don't have WILL_HIDE / HIDE state distinction in Ecore_IMF */
@@ -4210,12 +5062,17 @@ static Eina_Bool panel_agent_handler (void *data, Ecore_Fd_Handler *fd_handler)
     if (fd_handler == NULL)
         return ECORE_CALLBACK_RENEW;
 
+    char buf[256] = {0};
     int fd = ecore_main_fd_handler_fd_get (fd_handler);
     for (unsigned int i = 0; i < _read_handler_list.size (); i++) {
         if (fd_handler == _read_handler_list [i]) {
             if (!_panel_agent->filter_event (fd)) {
                 std::cerr << "_panel_agent->filter_event () is failed!!!\n";
                 ecore_main_fd_handler_del (fd_handler);
+
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  _panel_agent->filter_event (fd=%d) is failed!!!\n",
+                    time (0), getpid (), __FILE__, __func__, fd);
+                isf_save_log (buf);
             }
             return ECORE_CALLBACK_RENEW;
         }
@@ -4223,6 +5080,10 @@ static Eina_Bool panel_agent_handler (void *data, Ecore_Fd_Handler *fd_handler)
     std::cerr << "panel_agent_handler () has received exception event!!!\n";
     _panel_agent->filter_exception_event (fd);
     ecore_main_fd_handler_del (fd_handler);
+
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Received exception event (fd=%d)!!!\n",
+        time (0), getpid (), __FILE__, __func__, fd);
+    isf_save_log (buf);
     return ECORE_CALLBACK_RENEW;
 }
 
@@ -4236,14 +5097,20 @@ static Eina_Bool panel_agent_handler (void *data, Ecore_Fd_Handler *fd_handler)
  */
 static Eina_Bool helper_manager_input_handler (void *data, Ecore_Fd_Handler *fd_handler)
 {
+    char buf[256] = {0};
     if (_panel_agent->has_helper_manager_pending_event ()) {
         if (!_panel_agent->filter_helper_manager_event ()) {
             std::cerr << "_panel_agent->filter_helper_manager_event () is failed!!!\n";
+            snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  _panel_agent->filter_helper_manager_event () is failed!!!\n",
+                time (0), getpid (), __FILE__, __func__);
+            isf_save_log (buf);
             elm_exit ();
         }
     } else {
         std::cerr << "_panel_agent->has_helper_manager_pending_event () is failed!!!\n";
-        elm_exit ();
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  _panel_agent->has_helper_manager_pending_event () is failed!!!\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
     }
 
     return ECORE_CALLBACK_RENEW;
@@ -4256,8 +5123,13 @@ static Eina_Bool helper_manager_input_handler (void *data, Ecore_Fd_Handler *fd_
  */
 static void signalhandler (int sig)
 {
-    SCIM_DEBUG_MAIN (1) << __FUNCTION__ << " Signal=" << sig << "\n";
+    std::cerr << __FUNCTION__ << " Signal=" << sig << "\n";
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Signal=%d\n",
+        time (0), getpid (), __FILE__, __func__, sig);
+    isf_save_log (buf);
 
+    unregister_edbus_signal_handler ();
     elm_exit ();
 }
 
@@ -4289,6 +5161,7 @@ static bool update_keyboard_ise_locale (const String module_name, int index)
             }
             if (!factory.null ()) {
                 _names[index+j] = utf8_wcstombs (factory->get_name ());
+                _langs[index+j] = isf_get_normalized_language (factory->get_language ());
                 factory.reset ();
             }
         }
@@ -4371,12 +5244,7 @@ static void display_language_changed_cb (keynode_t *key, void* data)
         if (std::find (module_list.begin (), module_list.end (), _module_names[i]) != module_list.end ())
             continue;
         module_list.push_back (_module_names[i]);
-        if (_module_names[i] == String (COMPOSE_KEY_MODULE)) {
-            IMEngineFactoryPointer factory;
-            factory = new ComposeKeyFactory ();
-            _names[i] = utf8_wcstombs (factory->get_name ());
-            factory.reset ();
-        } else if (_modes[i] == TOOLBAR_KEYBOARD_MODE) {
+        if (_modes[i] == TOOLBAR_KEYBOARD_MODE) {
             update_keyboard_ise_locale (_module_names[i], i);
         } else if (_modes[i] == TOOLBAR_HELPER_MODE) {
             update_helper_ise_locale (_module_names[i], i);
@@ -4388,101 +5256,137 @@ static void display_language_changed_cb (keynode_t *key, void* data)
     String default_name = _names[get_ise_index (default_uuid)];
     _panel_agent->set_current_ise_name (default_name);
     _config->reload ();
-}
-#endif
 
-/**
- * @brief Start default ISE.
- *
- * @return void
- */
-static void start_default_ise (void)
-{
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+#ifdef HAVE_MINICONTROL
+    if (input_detect_minictrl.get_visibility ())
+        input_detect_minictrl.set_text (_("Input detected from hardware keyboard"), _("Tap to use virtual keyboard"));
 
-    String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), _initial_ise_uuid);
-    if (!set_active_ise (default_uuid)) {
-        std::cerr << __FUNCTION__ << " Failed to launch default ISE(" << default_uuid << ")\n";
-        LOGW ("Failed to launch default ISE (%s)\n", default_uuid.c_str ());
-
-        if (default_uuid != _initial_ise_uuid) {
-            std::cerr << __FUNCTION__ << " Launch initial ISE(" << _initial_ise_uuid << ")\n";
-            if (!set_active_ise (_initial_ise_uuid)) {
-                LOGW ("Failed to launch initial ISE (%s)\n", _initial_ise_uuid.c_str ());
-            } else {
-                LOGD ("Succeed to launch initial ISE (%s)\n", _initial_ise_uuid.c_str ());
-            }
-        }
-    } else {
-        LOGD ("Succeed to launch default ISE (%s)\n", default_uuid.c_str ());
+    if (ise_selector_minictrl.get_visibility ()) {
+        unsigned int idx = get_ise_index (_panel_agent->get_current_helper_uuid ());
+        String ise_name;
+        if (idx < _names.size ())
+            ise_name = _names[idx];
+        ise_selector_minictrl.set_text (_("Select input method"), ise_name.c_str ());
     }
+#endif
 }
+#endif
 
 /**
  * @brief Check hardware keyboard.
  *
  * @return void
  */
-static void check_hardware_keyboard (void)
+static void check_hardware_keyboard (KEYBOARD_MODE mode)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    if (_off_prepare_done_timer) {
-        ecore_timer_del (_off_prepare_done_timer);
-        _off_prepare_done_timer = NULL;
-    }
-
+    uint32 option = 0;
+    String uuid, name;
     unsigned int val = 0;
 
-    _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
-    if (ecore_x_window_prop_card32_get (ecore_x_window_root_first_get (), ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1)) {
-        uint32 option = 0;
-        String uuid, name;
-        String helper_uuid  = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String (""));
-        String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), String (""));
+    String helper_uuid  = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String (""));
+    String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), String (""));
 
-        if (val != 0) {
-            _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 1);
+    if (mode == HARDWARE_KEYBOARD_MODE) {
+        if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
+            LOGD ("HARDWARE_KEYBOARD_MODE return");
+            return;
+        }
 
-            if (_modes[get_ise_index (default_uuid)] == TOOLBAR_HELPER_MODE) {
-                /* Get the keyboard ISE */
-                isf_get_keyboard_ise (_config, uuid, name, option);
-                if (option & SCIM_IME_NOT_SUPPORT_HARDWARE_KEYBOARD) {
-                    uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
-                    std::cerr << __FUNCTION__ << ": Keyboard ISE (" << name << ") can not support hardware keyboard!!!\n";
-                }
-                /* Try to find reasonable keyboard ISE according to helper ISE language */
-                if (uuid == String (SCIM_COMPOSE_KEY_FACTORY_UUID)) {
-                    String helper_language = _langs [get_ise_index (default_uuid)];
-                    if (helper_language.length () > 0) {
-                        std::vector<String> ise_langs;
-                        scim_split_string_list (ise_langs, helper_language);
-                        for (size_t i = 0; i < _groups[ise_langs[0]].size (); ++i) {
-                            int j = _groups[ise_langs[0]][i];
-                            if (_uuids[j] != uuid && _modes[j] == TOOLBAR_KEYBOARD_MODE) {
-                                uuid = _uuids[j];
-                                break;
-                            }
+        LOGD ("HARDWARE KEYBOARD MODE");
+        _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 1);
+
+        if (_modes[get_ise_index (default_uuid)] == TOOLBAR_HELPER_MODE) {
+            /* Get the keyboard ISE */
+            isf_get_keyboard_ise (_config, uuid, name, option);
+            if (option & SCIM_IME_NOT_SUPPORT_HARDWARE_KEYBOARD) {
+                uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
+                std::cerr << __FUNCTION__ << ": Keyboard ISE (" << name << ") can not support hardware keyboard!!!\n";
+            }
+            /* Try to find reasonable keyboard ISE according to helper ISE language */
+            if (uuid == String (SCIM_COMPOSE_KEY_FACTORY_UUID)) {
+                String helper_language = _langs [get_ise_index (default_uuid)];
+                if (helper_language.length () > 0) {
+                    std::vector<String> ise_langs;
+                    scim_split_string_list (ise_langs, helper_language);
+                    for (size_t i = 0; i < _groups[ise_langs[0]].size (); ++i) {
+                        int j = _groups[ise_langs[0]][i];
+                        if (_uuids[j] != uuid && _modes[j] == TOOLBAR_KEYBOARD_MODE) {
+                            uuid = _uuids[j];
+                            break;
                         }
                     }
                 }
-            } else {
-                uuid = default_uuid;
             }
-            _ise_state = WINDOW_STATE_HIDE;
-            hw_kbd_mode = true;
         } else {
-            /* When switching back to S/W keyboard mode, let's hide candidate window first */
-            LOGD ("calling ui_candidate_hide (true, true, true)");
-            ui_candidate_hide (true, true, true);
+            uuid = default_uuid;
+        }
+        _ise_state = WINDOW_STATE_HIDE;
+        _panel_agent->set_current_toolbar_mode (TOOLBAR_KEYBOARD_MODE);
+        _panel_agent->hide_helper (helper_uuid);
+        _panel_agent->reload_config ();
+
+        ecore_x_event_mask_set (efl_get_quickpanel_window (), ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
+
+#ifdef HAVE_MINICONTROL
+        input_detect_minictrl.create ("inputpanel", EFL_CANDIDATE_THEME1, efl_get_quickpanel_window_angle ());
+        input_detect_minictrl.set_icon (EFL_CANDIDATE_THEME1, ISF_KEYBOARD_ICON_FILE);
+        input_detect_minictrl.set_text (_("Input detected from hardware keyboard"), _("Tap to use virtual keyboard"));
+        input_detect_minictrl.set_selected_callback (minictrl_clicked_cb, NULL);
+        input_detect_minictrl.show ();
+#endif
+
+        notification_status_message_post (_("Input detected from hardware keyboard"));
+
+        /* Set input detected property for isf setting */
+        val = (unsigned int)HARDWARE_KEYBOARD_MODE;
+        ecore_x_window_prop_card32_set (_control_window, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_INPUT_DETECTED), &val, 1);
+        ecore_x_window_prop_card32_set (ecore_x_window_root_first_get (), ecore_x_atom_get (PROP_X_EXT_KEYBOARD_INPUT_DETECTED), &val, 1);
+    } else if (mode == SOFTWARE_KEYBOARD_MODE) {
+        LOGD ("SOFTWARE KEYBOARD MODE");
+        /* When switching back to S/W keyboard mode, let's hide candidate window first */
+        LOGD ("calling ui_candidate_hide (true, true, true)");
+        ui_candidate_hide (true, true, true);
+        _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0);
+        if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
             uuid = helper_uuid.length () > 0 ? helper_uuid : _initial_ise_uuid;
-            hw_kbd_mode = false;
-            _panel_agent->reset_keyboard_ise ();
+            set_active_ise (uuid);
         }
 
-        set_active_ise (uuid);
+#ifdef HAVE_MINICONTROL
+        if (input_detect_minictrl.get_visibility ())
+            minictrl_clicked_cb (NULL, NULL, NULL, NULL);
+#endif
+
+        /* Set input detected property for isf setting */
+        val = (unsigned int)SOFTWARE_KEYBOARD_MODE;
+        ecore_x_test_fake_key_press ("XF86MenuKB");
+        ecore_x_window_prop_card32_set (_control_window, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_INPUT_DETECTED), &val, 1);
+        ecore_x_window_prop_card32_set (ecore_x_window_root_first_get (), ecore_x_atom_get (PROP_X_EXT_KEYBOARD_INPUT_DETECTED), &val, 1);
+    }
+    _config->reload ();
+}
+
+#if HAVE_BLUETOOTH
+/**
+ * @brief Callback function for the connection state of Bluetooth Keyboard
+ *
+ * @param result The result of changing the connection state
+ * @param connected The state to be changed. true means connected state, Otherwise, false.
+ * @param remote_address The remote address
+ * @param user_data The user data passed from the callback registration function
+ *
+ * @return void
+ */
+static void _bt_cb_hid_state_changed (int result, bool connected, const char *remote_address, void *user_data)
+{
+    if (connected == false) {
+       LOGD ("Bluetooth keyboard disconnected");
+       minictrl_clicked_cb (NULL, NULL, NULL, NULL);
     }
 }
+#endif
 
 /**
  * @brief Callback function for ECORE_X_EVENT_WINDOW_PROPERTY.
@@ -4502,13 +5406,17 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even
     if (ev == NULL)
         return ECORE_CALLBACK_PASS_ON;
 
-    Ecore_X_Window rootwin = ecore_x_window_root_first_get ();
-    if (ev->win == rootwin && ev->atom == ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST)) {
+    if (ev->win == _input_win && ev->atom == ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST)) {
         SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-        LOGD("keyboard connected");
-        check_hardware_keyboard ();
-        set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
-        _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+        unsigned int val = 0;
+        if (ecore_x_window_prop_card32_get (_input_win, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1) > 0) {
+            if (val == 0) {
+                _panel_agent->reset_keyboard_ise ();
+                check_hardware_keyboard (SOFTWARE_KEYBOARD_MODE);
+                set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
+                _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+            }
+        }
     } else if (ev->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) {
         if (ev->win == _control_window) {
             /* WMSYNC, #6 The keyboard window is displayed fully so set the conformant geometry */
@@ -4521,8 +5429,8 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even
 
                 /* Make sure that we have the same rotation angle with the keyboard window */
                 if (_ise_window) {
-                    _candidate_angle = efl_get_angle_for_ise_window ();
-                    _window_angle = efl_get_angle_for_ise_window ();
+                    _candidate_angle = efl_get_ise_window_angle ();
+                    _ise_angle = efl_get_ise_window_angle ();
                 }
 
                 if (_candidate_show_requested) {
@@ -4537,10 +5445,33 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even
 
                 set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
                 _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
-                _panel_agent->update_input_panel_event(
+                _panel_agent->update_input_panel_event (
                         ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW);
 
                 vconf_set_int (VCONFKEY_ISF_INPUT_PANEL_STATE, VCONFKEY_ISF_INPUT_PANEL_STATE_SHOW);
+
+                if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) {
+                    if (get_ise_size (TOOLBAR_HELPER_MODE) >= 2) {
+                        ecore_x_event_mask_set (efl_get_quickpanel_window (), ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
+
+#ifdef HAVE_MINICONTROL
+                        if (ise_selector_minictrl.create ("ise_selector", EFL_CANDIDATE_THEME1, efl_get_quickpanel_window_angle ())) {
+                            String ise_name;
+                            unsigned int idx = get_ise_index (_panel_agent->get_current_helper_uuid ());
+
+                            if (idx < _names.size ())
+                                ise_name = _names[idx];
+
+                            ise_selector_minictrl.set_text (_("Select input method"), ise_name.c_str ());
+                            ise_selector_minictrl.set_icon (EFL_CANDIDATE_THEME1, ISF_ISE_SELECTOR_ICON_FILE);
+                            ise_selector_minictrl.set_selected_callback (ise_selector_minictrl_clicked_cb, NULL);
+                            ise_selector_minictrl.show ();
+                        }
+#endif
+                    }
+                }
+
+                _updated_hide_state_geometry = false;
             } else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) {
                 /* WMSYNC, #9 The keyboard window is hidden fully so send HIDE state */
                 LOGD ("ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF\n");
@@ -4548,7 +5479,18 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even
                 //_panel_agent->update_input_panel_event (
                 //    ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE);
                 _ise_state = WINDOW_STATE_HIDE;
-                if (_panel_agent->get_current_toolbar_mode() == TOOLBAR_HELPER_MODE) {
+                _ise_angle = -1;
+                if (!_updated_hide_state_geometry) {
+                    /* When the ISE gets hidden by the window manager forcefully without OFF_PREPARE,
+                       the application might not have updated its autoscroll area */
+                    set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
+                    _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+                    _panel_agent->update_input_panel_event (
+                            ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE);
+
+                    _updated_hide_state_geometry = true;
+                }
+                if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) {
                     LOGD ("calling ui_candidate_hide (true, false)");
                     ui_candidate_hide (true, false);
                 } else {
@@ -4557,10 +5499,27 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even
 
                 vconf_set_int (VCONFKEY_ISF_INPUT_PANEL_STATE, VCONFKEY_ISF_INPUT_PANEL_STATE_HIDE);
 
+#ifdef HAVE_MINICONTROL
+                ise_selector_minictrl.destroy ();
+#endif
+
                 _ise_reported_geometry.valid = false;
             }
             ui_settle_candidate_window ();
         }
+    } else if (ev->atom == ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE) {
+        if (ev->win == efl_get_quickpanel_window ()) {
+            int angle = efl_get_quickpanel_window_angle ();
+            LOGD ("ev->win : %p, change window angle : %d\n", ev->win, angle);
+
+#ifdef HAVE_MINICONTROL
+            if (input_detect_minictrl.get_visibility ())
+                input_detect_minictrl.rotate (angle);
+
+            if (ise_selector_minictrl.get_visibility ())
+                ise_selector_minictrl.rotate (angle);
+#endif
+        }
     }
 
     return ECORE_CALLBACK_PASS_ON;
@@ -4593,11 +5552,12 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             // WILL_SHOW_REQUEST_DONE Ack to WM
             Ecore_X_Window root_window = ecore_x_window_root_get (_control_window);
             ecore_x_e_virtual_keyboard_on_prepare_done_send (root_window, _control_window);
-            LOGD ("_ecore_x_e_virtual_keyboard_on_prepare_done_send(%x, %x)\n",
+            LOGD ("_ecore_x_e_virtual_keyboard_on_prepare_done_send (%x, %x)\n",
                     root_window, _control_window);
 
             _panel_agent->update_input_panel_event (
                     ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW);
+            ui_create_candidate_window ();
 
             vconf_set_int (VCONFKEY_ISF_INPUT_PANEL_STATE, VCONFKEY_ISF_INPUT_PANEL_STATE_WILL_SHOW);
         } else if (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST) {
@@ -4615,13 +5575,14 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             _ise_reported_geometry.valid = false;
             set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
             _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+            _updated_hide_state_geometry = true;
 
             /* If the input panel is getting hidden because of hw keyboard mode while
                the candidate window is still opened, it is considered to be an
                "input panel being resized" event instead of "input panel being hidden",
                since the candidate window will work as an "input panel" afterwards */
             bool send_input_panel_hide_event = true;
-            if (hw_kbd_mode) {
+            if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) {
                 LOGD ("_candidate_state : %d", _candidate_state);
                 if (_candidate_state == WINDOW_STATE_SHOW) {
                     send_input_panel_hide_event = false;
@@ -4632,7 +5593,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
                         ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE);
             }
             // For now don't send WILL_HIDE signal here
-            //_panel_agent->update_input_panel_event(
+            //_panel_agent->update_input_panel_event (
             //    ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_WILL_HIDE);
             // Instead send HIDE signal
             vconf_set_int (VCONFKEY_ISF_INPUT_PANEL_STATE, VCONFKEY_ISF_INPUT_PANEL_STATE_WILL_HIDE);
@@ -4640,7 +5601,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             /* WMSYNC, #10 Register size hints for candidate window and set conformant geometry */
             // PRE_ROTATE_DONE Ack to WM
             _candidate_angle = ev->data.l[1];
-            _window_angle = ev->data.l[1];
+            _ise_angle = ev->data.l[1];
             LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_PREPARE : %d\n", _candidate_angle);
 
             if (_candidate_angle == 90 || _candidate_angle == 270) {
@@ -4655,14 +5616,14 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             ui_settle_candidate_window ();
             ui_candidate_window_rotate (_candidate_angle);
             Ecore_X_Window root_window = ecore_x_window_root_get (_control_window);
-            LOGD ("ecore_x_e_window_rotation_change_prepare_done_send(%d)\n", _candidate_angle);
+            LOGD ("ecore_x_e_window_rotation_change_prepare_done_send (%d)\n", _candidate_angle);
             ecore_x_e_window_rotation_change_prepare_done_send (root_window,
                     _control_window, _candidate_angle);
         } else if (ev->message_type == ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST) {
             int ise_angle = (int)ev->data.l[1];
-            LOGD("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST for ISE WINDOW : %d %d\n", ise_angle, _candidate_angle);
+            LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST for ISE WINDOW : ISE angle : %d, Candidate angle : %d\n", ise_angle, _candidate_angle);
             _candidate_angle = ise_angle;
-            _window_angle = ise_angle;
+            _ise_angle = ise_angle;
             if (_ise_state == WINDOW_STATE_SHOW) {
                 set_keyboard_geometry_atom_info (_app_window, get_ise_geometry ());
                 _panel_agent->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
@@ -4675,7 +5636,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             if (ev->message_type == ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST) {
                 _candidate_angle = (int)ev->data.l[1];
                 ui_candidate_window_rotate (_candidate_angle);
-                LOGD("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST : %d\n", _candidate_angle);
+                LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST : %d\n", _candidate_angle);
             } else if (ev->message_type == ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE &&
                 _ise_state != WINDOW_STATE_SHOW) {
                 ecore_x_e_window_rotation_app_set (elm_win_xwindow_get (_candidate_window), EINA_TRUE);
@@ -4688,7 +5649,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
                 ui_candidate_window_rotate (_candidate_angle);
                 ui_settle_candidate_window ();
                 ecore_x_e_window_rotation_app_set (elm_win_xwindow_get (_candidate_window), EINA_FALSE);
-                LOGD("ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE : %d\n", _candidate_angle);
+                LOGD ("ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE : %d\n", _candidate_angle);
             }
             SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " : ANGLE (" << _candidate_angle << ")\n";
         }
@@ -4703,8 +5664,8 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
             if ((unsigned int)ev->data.l[0] == elm_win_xwindow_get (_candidate_window)) {
                 if ((unsigned int)ev->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE) {
                     // 1 finger double tap
-                    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "    1 finger double tap (" << last_pos_x << ", " << last_pos_y << ")\n";
-                    ui_mouse_click (last_pos_x, last_pos_y);
+                    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "    1 finger double tap focus index = " << _candidate_tts_focus_index << "\n";
+                    ui_mouse_click (_candidate_tts_focus_index);
                 } else if ((unsigned int)ev->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ) {
                     // 1 finger tap
                     // 1 finger touch & move
@@ -4712,6 +5673,93 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
                     last_pos_y = ev->data.l[3];
                     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "    1 finger touch & move (" << last_pos_x << ", " << last_pos_y << ")\n";
                     ui_mouse_over (last_pos_x, last_pos_y);
+                } else if ((unsigned int)ev->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_NEXT ||
+                           (unsigned int)ev->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_PREV) {
+                    if ((unsigned int)ev->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_NEXT) {
+                        // flick right
+                        SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "    1 finger flick right\n";
+                        if (evas_object_visible_get (_more_btn) && _candidate_tts_focus_index == (_candidate_display_number - 1))
+                            _candidate_tts_focus_index = _candidate_display_number == _candidate_row_items[0] ? MORE_BUTTON_INDEX : 0;
+                        else if (evas_object_visible_get (_more_btn) && _candidate_tts_focus_index == (_candidate_row_items[0] - 1))
+                            _candidate_tts_focus_index = MORE_BUTTON_INDEX;
+                        else if (evas_object_visible_get (_close_btn) && _candidate_tts_focus_index == (_candidate_row_items[0] - 1))
+                            _candidate_tts_focus_index = CLOSE_BUTTON_INDEX;
+                        else if (_candidate_tts_focus_index == MORE_BUTTON_INDEX)
+                            _candidate_tts_focus_index = _candidate_display_number == _candidate_row_items[0] ? 0 : _candidate_row_items[0];
+                        else if (_candidate_tts_focus_index == CLOSE_BUTTON_INDEX)
+                            _candidate_tts_focus_index = _candidate_row_items[0];
+                        else if (_candidate_tts_focus_index >= 0 && _candidate_tts_focus_index < (g_isf_candidate_table.get_current_page_size () - 1))
+                            _candidate_tts_focus_index++;
+                        else if (_candidate_tts_focus_index == (g_isf_candidate_table.get_current_page_size () - 1))
+                            _candidate_tts_focus_index = 0;
+                    } else {
+                        // flick left
+                        SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "    1 finger flick left\n";
+                        if (evas_object_visible_get (_more_btn) && _candidate_tts_focus_index == 0)
+                            _candidate_tts_focus_index = _candidate_display_number == _candidate_row_items[0] ? MORE_BUTTON_INDEX : _candidate_display_number - 1;
+                        else if (evas_object_visible_get (_more_btn) && _candidate_tts_focus_index == (int)_candidate_row_items[0])
+                            _candidate_tts_focus_index = MORE_BUTTON_INDEX;
+                        else if (evas_object_visible_get (_close_btn) && _candidate_tts_focus_index == (int)_candidate_row_items[0])
+                            _candidate_tts_focus_index = CLOSE_BUTTON_INDEX;
+                        else if (_candidate_tts_focus_index == MORE_BUTTON_INDEX)
+                            _candidate_tts_focus_index = _candidate_row_items[0] - 1;
+                        else if (_candidate_tts_focus_index == CLOSE_BUTTON_INDEX)
+                            _candidate_tts_focus_index = _candidate_row_items[0] - 1;
+                        else if (_candidate_tts_focus_index > 0 && _candidate_tts_focus_index < g_isf_candidate_table.get_current_page_size ())
+                            _candidate_tts_focus_index--;
+                        else if (_candidate_tts_focus_index == 0)
+                            _candidate_tts_focus_index = g_isf_candidate_table.get_current_page_size () - 1;
+                    }
+
+                    int x = 0, y = 0, w = 0, h = 0;
+                    _wait_stop_event = false;
+                    if (candidate_expanded) {
+                        int total = 0;
+                        int cursor_line = 0;
+                        for (unsigned int i = 0; i < _candidate_row_items.size (); i++) {
+                            total += _candidate_row_items [i];
+                            if (total > (int)_candidate_display_number && _candidate_tts_focus_index >= total)
+                                cursor_line++;
+                        }
+
+                        elm_scroller_region_get (_candidate_area_2, &x, &y, &w, &h);
+
+                        int line_h   = _item_min_height + _v_padding;
+                        int cursor_y = cursor_line * line_h;
+                        if (cursor_y < y) {
+                            elm_scroller_region_bring_in (_candidate_area_2, 0, cursor_y, w, h);
+                            _wait_stop_event = true;
+                        } else if (cursor_y >= y + h) {
+                            elm_scroller_region_bring_in (_candidate_area_2, 0, cursor_y + line_h - h, w, h);
+                            _wait_stop_event = true;
+                        }
+                    }
+
+                    x = y = w = h = 0;
+                    String strTts = String ("");
+                    if (_candidate_tts_focus_index >= 0 && _candidate_tts_focus_index < g_isf_candidate_table.get_current_page_size ()) {
+                        strTts = utf8_wcstombs (g_isf_candidate_table.get_candidate_in_current_page (_candidate_tts_focus_index));
+                        if (_candidate_0 [_candidate_tts_focus_index])
+                            evas_object_geometry_get (_candidate_0 [_candidate_tts_focus_index], &x, &y, &w, &h);
+                    } else if (_candidate_tts_focus_index == MORE_BUTTON_INDEX) {
+                        strTts = String (_("more button"));
+                        evas_object_geometry_get (_more_btn, &x, &y, &w, &h);
+                    } else if (_candidate_tts_focus_index == CLOSE_BUTTON_INDEX) {
+                        strTts = String (_("close button"));
+                        evas_object_geometry_get (_close_btn, &x, &y, &w, &h);
+                    } else {
+                        LOGW ("TTS focus index = %d", _candidate_tts_focus_index);
+                        ui_tts_focus_rect_hide ();
+                    }
+
+                    if (strTts.length () > 0)
+                        ui_play_tts (strTts.c_str ());
+                    if (w > 0 && h > 0) {
+                        if (!_wait_stop_event)
+                            ui_tts_focus_rect_show (x, y, w, h);
+                        else
+                            ui_tts_focus_rect_hide ();
+                    }
                 }
             }
         }
@@ -4721,6 +5769,31 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event)
 }
 
 /**
+ * @brief Callback function for focus out event of application window
+ *
+ * @param data Data to pass when it is called.
+ *
+ * @return ECORE_CALLBACK_RENEW
+ */
+
+static Eina_Bool x_event_window_focus_out_cb (void *data, int ev_type, void *event)
+{
+    Ecore_X_Event_Window_Focus_Out *e = (Ecore_X_Event_Window_Focus_Out*)event;
+
+    if (e && e->win == _app_window) {
+
+        if (_panel_agent->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) {
+            LOGD ("Application window focus OUT! Panel hides ISE");
+            _panel_agent->hide_helper (_panel_agent->get_current_helper_uuid ());
+            slot_hide_ise ();
+            ui_candidate_hide (true, false, false);
+        }
+    }
+
+    return ECORE_CALLBACK_RENEW;
+}
+
+/**
  * @brief : Checks whether the window manager is launched or not
  * @return true if window manager launched, else false
  */
@@ -4740,66 +5813,42 @@ static bool check_wm_ready (void)
 }
 
 /**
- * @brief : Checks whether the system service is ready or not
- * @return true if all system service are ready, else false
+ * @brief : Launches default soft keyboard for performance enhancement (It's not mandatory)
  */
-static bool check_system_ready (void)
-{
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    int ret = 0;
-    int val = 0;
-    ret = vconf_get_int (ISF_SYSTEM_APPSERVICE_READY_VCONF, &val);
-
-    LOGD ("ret : %d, val : %d\n", ret, val);
-
-    if (ret == 0 && val >= ISF_SYSTEM_APPSERVICE_READY_STATE) {
-        LOGD ("Appservice was ready\n");
-        return true;
-    } else {
-        /* Register a call back function for checking system ready */
-        if (!_appsvc_callback_regist) {
-            if (vconf_notify_key_changed (ISF_SYSTEM_APPSERVICE_READY_VCONF, launch_default_soft_keyboard, NULL)) {
-                _appsvc_callback_regist = true;
-            }
-
-            if (!_system_ready_timer) {
-                _system_ready_timer = ecore_timer_add (5.0, system_ready_timeout_cb, NULL);
-            }
-        }
-
-        return false;
-    }
-}
-
-static void _launch_default_soft_keyboard (void)
+static void launch_default_soft_keyboard (keynode_t *key, void* data)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    if (_appsvc_callback_regist)
-        vconf_ignore_key_changed (ISF_SYSTEM_APPSERVICE_READY_VCONF, launch_default_soft_keyboard);
-
-    if (_system_ready_timer) {
-        ecore_timer_del (_system_ready_timer);
-        _system_ready_timer = NULL;
-    }
-
     /* Start default ISE */
-    start_default_ise ();
-    check_hardware_keyboard ();
+    check_hardware_keyboard (SOFTWARE_KEYBOARD_MODE);
 }
 
-/**
- * @brief : Launches default soft keyboard for performance enhancement (It's not mandatory)
- */
-static void launch_default_soft_keyboard (keynode_t *key, void* data)
+static String sanitize_string(const char *str, int maxlen = 32)
 {
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    /* Soft keyboard will be started when all system service are ready */
-    if (check_system_ready ()) {
-        _launch_default_soft_keyboard ();
+    String ret;
+    static char acceptables[] =
+        "abcdefghijklmnopqrstuvwxyz"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "1234567890_-.@:";
+
+    char *newstr = NULL;
+    if (maxlen > 0) {
+        newstr = new char[maxlen + 1];
+    }
+    int len = 0;
+    if (newstr) {
+        memset (newstr, 0x00, sizeof(char) * (maxlen + 1));
+
+        if (str) {
+            while (len < maxlen && str[len] != '\0' && strchr(acceptables, str[len]) != NULL) {
+                newstr[len] = str[len];
+                len++;
+            }
+            ret = newstr;
+        }
+        delete [] newstr;
     }
+    return ret;
 }
 
 int main (int argc, char *argv [])
@@ -4809,6 +5858,7 @@ int main (int argc, char *argv [])
 
     int           i;
     int           ret             = 0;
+    int           win_ret         = -1;
 
     bool          daemon          = false;
     bool          should_resident = true;
@@ -4818,14 +5868,21 @@ int main (int argc, char *argv [])
     ConfigModule *config_module   = NULL;
     String        config_name     = String ("socket");
     String        display_name    = String ();
+    Ecore_X_Atom  atom            = 0;
 
     Ecore_Fd_Handler *panel_agent_read_handler = NULL;
     Ecore_Fd_Handler *helper_manager_handler   = NULL;
     Ecore_Event_Handler *xclient_message_handler  = NULL;
     Ecore_Event_Handler *xwindow_property_handler = NULL;
+    Ecore_Event_Handler *xwindow_focus_out_handler = NULL;
+
+    set_app_privilege ("isf", NULL, NULL);
 
     check_time ("\nStarting ISF Panel EFL...... ");
-    LOGD ("Starting ISF Panel EFL...... \n");
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Starting ISF Panel EFL......\n",
+        time (0), getpid (), __FILE__, __func__);
+    isf_save_log (buf);
 
     DebugOutput::disable_debug (SCIM_DEBUG_AllMask);
     DebugOutput::enable_debug (SCIM_DEBUG_MainMask);
@@ -4898,7 +5955,7 @@ int main (int argc, char *argv [])
                 ret = -1;
                 goto cleanup;
             }
-            display_name = argv [i];
+            display_name = sanitize_string (argv [i]);
             continue;
         }
 
@@ -4953,18 +6010,21 @@ int main (int argc, char *argv [])
             display_name = String (p);
     }
 
-    char buf [256];
     snprintf (buf, sizeof (buf), "config_name=%s display_name=%s", config_name.c_str (), display_name.c_str ());
     check_time (buf);
     try {
         if (!initialize_panel_agent (config_name, display_name, should_resident)) {
             check_time ("Failed to initialize Panel Agent!");
             std::cerr << "Failed to initialize Panel Agent!\n";
+            snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Failed to initialize Panel Agent!\n",
+                time (0), getpid (), __FILE__, __func__);
+            isf_save_log (buf);
+
             ret = -1;
             goto cleanup;
         }
     } catch (scim::Exception & e) {
-        std::cerr << e.what() << "\n";
+        std::cerr << e.what () << "\n";
         ret = -1;
         goto cleanup;
     }
@@ -4983,17 +6043,19 @@ int main (int argc, char *argv [])
     /* Initialize global variables and pointers for candidate items and etc. */
     for (i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; i++) {
         _candidate_0 [i]     = NULL;
-        _candidate_items [i] = NULL;
         _seperate_0 [i]      = NULL;
         _seperate_items [i]  = NULL;
         _line_0 [i]          = NULL;
         _line_items [i]      = NULL;
+        _candidate_text [i]  = NULL;
+        _candidate_image [i] = NULL;
+        _candidate_pop_image [i] = NULL;
     }
 
     try {
         _panel_agent->send_display_name (display_name);
     } catch (scim::Exception & e) {
-        std::cerr << e.what() << "\n";
+        std::cerr << e.what () << "\n";
         ret = -1;
         goto cleanup;
     }
@@ -5018,6 +6080,20 @@ int main (int argc, char *argv [])
 
     elm_policy_set (ELM_POLICY_THROTTLE, ELM_POLICY_THROTTLE_NEVER);
 
+    /* get the input window */
+    atom = ecore_x_atom_get (E_PROP_DEVICEMGR_INPUTWIN);
+    win_ret = ecore_x_window_prop_xid_get (ecore_x_window_root_first_get (), atom, ECORE_X_ATOM_WINDOW, &_input_win, 1);
+    if (_input_win == 0 || win_ret < 1) {
+        LOGW ("Input window is NULL!\n");
+    } else {
+        ecore_x_event_mask_set (_input_win, ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
+
+        unsigned int val = 0;
+        Ecore_X_Window root_window = ecore_x_window_root_get (_input_win);
+        ecore_x_window_prop_card32_set (_input_win, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1);
+        ecore_x_window_prop_card32_set (root_window, ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &val, 1);
+    }
+
     if (!efl_create_control_window ()) {
         LOGW ("Failed to create control window\n");
         goto cleanup;
@@ -5053,6 +6129,9 @@ int main (int argc, char *argv [])
     vconf_notify_key_changed (VCONFKEY_LANGSET, display_language_changed_cb, NULL);
 #endif
 
+    if (0 != register_edbus_signal_handler ())
+        LOGW ("register edbus signal fail");
+
     try {
         /* Update ISE list */
         std::vector<String> list;
@@ -5068,8 +6147,19 @@ int main (int argc, char *argv [])
     }
 
     xclient_message_handler  = ecore_event_handler_add (ECORE_X_EVENT_CLIENT_MESSAGE, x_event_client_message_cb, NULL);
-    ecore_x_event_mask_set (ecore_x_window_root_first_get (), ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
     xwindow_property_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_PROPERTY, x_event_window_property_cb, NULL);
+    xwindow_focus_out_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_FOCUS_OUT, x_event_window_focus_out_cb, NULL);
+
+#if HAVE_BLUETOOTH
+    /* Register the callback function of Bluetooth connection */
+     ret = bt_initialize ();
+     if (ret != BT_ERROR_NONE)
+         LOGW ("Fail to init Bluetooth");
+
+     ret = bt_hid_host_initialize (_bt_cb_hid_state_changed, NULL);
+     if (ret != BT_ERROR_NONE)
+         LOGW ("bt_hid_host_initialize failed");
+#endif
 
     /* Set elementary scale */
     if (_screen_width)
@@ -5079,7 +6169,6 @@ int main (int argc, char *argv [])
     signal (SIGTERM, signalhandler);
     signal (SIGINT,  signalhandler);
     signal (SIGHUP,  signalhandler);
-    signal (SIGABRT, signalhandler);
 
     check_time ("EFL Panel launch time");
 
@@ -5088,8 +6177,21 @@ int main (int argc, char *argv [])
     _config->flush ();
     ret = 0;
 
+#if HAVE_BLUETOOTH
+    /* deinitialize the callback function of Bluetooth connection */
+    ret = bt_hid_host_deinitialize ();
+    if (ret != BT_ERROR_NONE)
+        LOGW ("bt_hid_host_deinitialize failed: %d", ret);
+
+    ret = bt_deinitialize ();
+    if (ret != BT_ERROR_NONE)
+        LOGW ("bt_deinitialize failed: %d", ret);
+#endif
+
     ecore_event_handler_del (xclient_message_handler);
     ecore_event_handler_del (xwindow_property_handler);
+    ecore_event_handler_del (xwindow_focus_out_handler);
+
     if (helper_manager_handler)
         ecore_main_fd_handler_del (helper_manager_handler);
     for (unsigned int ii = 0; ii < _read_handler_list.size (); ++ii) {
@@ -5107,8 +6209,12 @@ cleanup:
     ui_candidate_delete_longpress_timer ();
     ui_candidate_delete_destroy_timer ();
     delete_ise_directory_em ();
+    destroy_ise_selector ();
+    delete_ise_launch_timer ();
     ui_close_tts ();
 
+    unregister_edbus_signal_handler ();
+
     if (!_config.null ())
         _config.reset ();
     if (config_module)
@@ -5124,6 +6230,9 @@ cleanup:
 
     delete []new_argv;
 
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  ret=%d\n",
+        time (0), getpid (), __FILE__, __func__, ret);
+    isf_save_log (buf);
     if (ret == 0) {
         std::cerr << "Successfully exited.\n";
         return 0;
index cb389eb..d538ccf 100644 (file)
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dlog.h>
-
+#include <errno.h>
 
 /////////////////////////////////////////////////////////////////////////////
 // Declaration of macro.
@@ -211,8 +211,6 @@ void isf_save_ise_information (void)
 
     std::vector<ISEINFO> info_list;
     for (size_t i = 0; i < _module_names.size (); ++i) {
-        if (_module_names[i] == COMPOSE_KEY_MODULE)
-            continue;
         ISEINFO info;
         info.name     = _names[i];
         info.uuid     = _uuids[i];
@@ -261,19 +259,6 @@ void isf_get_factory_list (LOAD_ISE_TYPE  type,
     options.clear ();
     _groups.clear ();
 
-    if (type != HELPER_ONLY) {
-        /* Add ComposeKeyFactory first. */
-        IMEngineFactoryPointer factory = new ComposeKeyFactory ();
-        uuids.push_back (factory->get_uuid ());
-        names.push_back (utf8_wcstombs (factory->get_name ()));
-        module_names.push_back (COMPOSE_KEY_MODULE);
-        langs.push_back (isf_get_normalized_language (factory->get_language ()));
-        icons.push_back (factory->get_icon_file ());
-        modes.push_back (TOOLBAR_KEYBOARD_MODE);
-        options.push_back (factory->get_option ());
-        factory.reset ();
-    }
-
     String user_file_name = String (USER_ENGINE_FILE_NAME);
     FILE *engine_list_file = fopen (user_file_name.c_str (), "r");
     if (engine_list_file == NULL) {
@@ -341,7 +326,7 @@ static bool add_keyboard_ise_module (const String module_name, const ConfigPoint
     String filename = String (USER_ENGINE_FILE_NAME);
     FILE *engine_list_file = fopen (filename.c_str (), "a");
     if (engine_list_file == NULL) {
-        LOGD ("Failed to open %s!!!\n", filename.c_str ());
+        LOGW ("Failed to open %s!!!\n", filename.c_str ());
         return false;
     }
 
@@ -377,7 +362,7 @@ static bool add_keyboard_ise_module (const String module_name, const ConfigPoint
                     String line = isf_combine_ise_info_string (name, uuid, module_name, language,
                                                                icon, String (mode), String (option), factory->get_locales ());
                     if (fputs (line.c_str (), engine_list_file) < 0) {
-                        LOGD ("Failed to write (%s)!!!\n", line.c_str ());
+                        LOGW ("Failed to write (%s)!!!\n", line.c_str ());
                         break;
                     }
                 }
@@ -386,14 +371,14 @@ static bool add_keyboard_ise_module (const String module_name, const ConfigPoint
         }
         ime_module.unload ();
     } else {
-        LOGD ("Failed to load (%s)!!!", module_name.c_str ());
+        LOGW ("Failed to load (%s)!!!", module_name.c_str ());
         fclose (engine_list_file);
         return false;
     }
 
     int ret = fclose (engine_list_file);
     if (ret != 0)
-        LOGD ("Failed to fclose %s!!!\n", filename.c_str ());
+        LOGW ("Failed to fclose %s!!!\n", filename.c_str ());
 
     return true;
 }
@@ -416,7 +401,7 @@ static bool add_helper_ise_module (const String module_name)
     String filename = String (USER_ENGINE_FILE_NAME);
     FILE *engine_list_file = fopen (filename.c_str (), "a");
     if (engine_list_file == NULL) {
-        LOGD ("Failed to open %s!!!\n", filename.c_str ());
+        LOGW ("Failed to open %s!!!\n", filename.c_str ());
         return false;
     }
 
@@ -440,20 +425,20 @@ static bool add_helper_ise_module (const String module_name)
             String line = isf_combine_ise_info_string (helper_info.name, helper_info.uuid, module_name, isf_get_normalized_language (helper_module.get_helper_lang (j)),
                                                        helper_info.icon, String (mode), String (option), String (""));
             if (fputs (line.c_str (), engine_list_file) < 0) {
-                 LOGD ("Failed to write (%s)!!!\n", line.c_str ());
+                 LOGW ("Failed to write (%s)!!!\n", line.c_str ());
                  break;
             }
         }
         helper_module.unload ();
     } else {
-        LOGD ("Failed to load (%s)!!!", module_name.c_str ());
+        LOGW ("Failed to load (%s)!!!", module_name.c_str ());
         fclose (engine_list_file);
         return false;
     }
 
     int ret = fclose (engine_list_file);
     if (ret != 0)
-        LOGD ("Failed to fclose %s!!!\n", filename.c_str ());
+        LOGW ("Failed to fclose %s!!!\n", filename.c_str ());
 
     return true;
 }
@@ -477,7 +462,6 @@ bool isf_update_ise_list (LOAD_ISE_TYPE type, const ConfigPointer &config)
 
     /* Check keyboard ISEs */
     if (type != HELPER_ONLY) {
-        install_modules.push_back (COMPOSE_KEY_MODULE);
         std::vector<String> imengine_list;
         scim_get_imengine_module_list (imengine_list);
         for (size_t i = 0; i < imengine_list.size (); ++i) {
@@ -509,7 +493,7 @@ bool isf_update_ise_list (LOAD_ISE_TYPE type, const ConfigPointer &config)
                 uninstall_modules.push_back (_module_names [i]);
                 String filename = String (USER_ENGINE_FILE_NAME);
                 if (isf_remove_ise_info_from_file (filename.c_str (), _module_names [i].c_str ()) == false)
-                    LOGD ("Failed to remove %s from cache file : %s!!!", _module_names [i].c_str (), filename.c_str ());
+                    LOGW ("Failed to remove %s from cache file : %s!!!", _module_names [i].c_str (), filename.c_str ());
             }
         }
     }
@@ -563,7 +547,7 @@ bool isf_update_ise_list (LOAD_ISE_TYPE type, const ConfigPointer &config)
 bool isf_remove_ise_module (const String module_name, const ConfigPointer &config)
 {
     if (std::find (_module_names.begin (), _module_names.end (), module_name) == _module_names.end ()) {
-        LOGD ("Cannot to find %s!!!", module_name.c_str ());
+        LOGW ("Cannot to find %s!!!", module_name.c_str ());
         return true;
     }
 
@@ -584,7 +568,7 @@ bool isf_remove_ise_module (const String module_name, const ConfigPointer &confi
         }
         return true;
     } else {
-        LOGD ("Failed to remove %s from cache file : %s!!!", module_name.c_str (), filename.c_str ());
+        LOGW ("Failed to remove %s from cache file : %s!!!", module_name.c_str (), filename.c_str ());
         return false;
     }
 }
@@ -593,7 +577,11 @@ bool isf_update_ise_module (const String strModulePath, const ConfigPointer &con
 {
     bool ret = false;
     struct stat filestat;
-    stat (strModulePath.c_str (), &filestat);
+    if (stat (strModulePath.c_str (), &filestat) == -1) {
+        LOGW ("can't access : %s, reason : %s\n", strModulePath.c_str (), strerror (errno));
+        return false;
+    }
+
     if (!S_ISDIR (filestat.st_mode)) {
         int begin = strModulePath.find_last_of (SCIM_PATH_DELIM) + 1;
         String mod_name = strModulePath.substr (begin, strModulePath.find_last_of ('.') - begin);
@@ -613,7 +601,7 @@ bool isf_update_ise_module (const String strModulePath, const ConfigPointer &con
                 }
             }
         } else {
-            LOGD ("%s is not valid so file!!!", strModulePath.c_str ());
+            LOGW ("%s is not valid so file!!!", strModulePath.c_str ());
         }
     }
 
@@ -634,6 +622,29 @@ bool isf_update_ise_module (const String strModulePath, const ConfigPointer &con
     return ret;
 }
 
+/**
+ * @brief Get normalized language name.
+ *
+ * @param src_str The language name before normalized.
+ *
+ * @return normalized language name.
+ */
+String isf_get_normalized_language (String src_str)
+{
+    if (src_str.length () == 0)
+        return String ("en");
+
+    std::vector<String> str_list, dst_list;
+    scim_split_string_list (str_list, src_str);
+
+    for (size_t i = 0; i < str_list.size (); i++)
+        dst_list.push_back (scim_get_normalized_language (str_list[i]));
+
+    String dst_str =  scim_combine_string_list (dst_list);
+
+    return dst_str;
+}
+
 /*
 vi:ts=4:nowrap:ai:expandtab
 */
index 81cb35d..1c79019 100644 (file)
@@ -65,6 +65,7 @@ void isf_save_ise_information (void);
 void isf_load_ise_information (LOAD_ISE_TYPE type, const ConfigPointer &config);
 bool isf_update_ise_list (LOAD_ISE_TYPE type, const ConfigPointer &config);
 bool isf_update_ise_module (const String strModulePath, const ConfigPointer &config);
+String isf_get_normalized_language (String src_str);
 
 #endif /* __ISF_PANEL_UTILITY_H */
 
diff --git a/ism/extras/efl_panel/minicontrol.cpp b/ism/extras/efl_panel/minicontrol.cpp
new file mode 100644 (file)
index 0000000..4ce2370
--- /dev/null
@@ -0,0 +1,191 @@
+/*
+ * ISF(Input Service Framework)
+ *
+ * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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 "minicontrol.h"
+#include <Elementary.h>
+#include <minicontrol-provider.h>
+
+#define MINI_CONTROLLER_WIDTH (698)
+#define MINI_CONTROLLER_WIDTH_LANDSCAPE (1258)
+#define MINI_CONTROLLER_HEIGHT (180)
+
+MiniControl::MiniControl ()
+    : win (0),
+      layout (0),
+      visibility (false)
+{
+
+}
+
+MiniControl::~MiniControl ()
+{
+    destroy ();
+}
+
+bool
+MiniControl::create (const char *name, const char *file, int angle)
+{
+    if (win)
+        return false;
+
+    char mcname[1024] = {0};
+    snprintf (mcname, sizeof (mcname), "%s_minictrl_ongoing", name);
+
+    win = minicontrol_win_add (mcname);
+    if (!win) {
+        return false;
+    }
+
+    double scale = elm_config_scale_get ();
+    if (angle == 90 || angle == 270)
+        evas_object_resize (win, MINI_CONTROLLER_WIDTH_LANDSCAPE * scale, MINI_CONTROLLER_HEIGHT * scale);
+    else
+        evas_object_resize (win, MINI_CONTROLLER_WIDTH * scale, MINI_CONTROLLER_HEIGHT * scale);
+
+    /* create bg */
+    Evas_Object *bg;
+    bg = elm_bg_add (win);
+    evas_object_size_hint_weight_set (bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    elm_win_resize_object_add (win, bg);
+    elm_bg_color_set (bg, 0, 0, 0);
+    evas_object_show (bg);
+
+    /* load layout */
+    layout = elm_layout_add (win);
+    elm_layout_file_set (layout, file , "mini_controller");
+    evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+    elm_win_resize_object_add (win, layout);
+    evas_object_show (layout);
+
+    return true;
+}
+
+void
+MiniControl::destroy ()
+{
+    if (layout) {
+        evas_object_del (layout);
+        layout = NULL;
+    }
+
+    if (win) {
+        evas_object_del (win);
+        win = NULL;
+    }
+
+    visibility = false;
+}
+
+void
+MiniControl::set_text (const char *title, const char *content)
+{
+    if (!layout) return;
+
+    Evas_Object *layout_edj = elm_layout_edje_get (layout);
+    if (layout_edj) {
+        Eina_Strbuf *title_text = eina_strbuf_new ();
+        Eina_Strbuf *content_text = eina_strbuf_new ();
+
+        Evas_Object *title_label = elm_label_add (layout_edj);
+        elm_label_line_wrap_set (title_label, ELM_WRAP_WORD);
+
+        Evas_Object *content_label = elm_label_add (layout_edj);
+        elm_label_line_wrap_set (content_label, ELM_WRAP_WORD);
+
+        eina_strbuf_append_printf (title_text, "<font_size=30 color=#ffffff>%s</>", title);
+        eina_strbuf_append_printf (content_text, "<font_size=28 color=#abaaaa>%s</>", content);
+
+        elm_object_text_set (title_label, eina_strbuf_string_get (title_text));
+        elm_object_part_content_set (layout, "title_text", title_label);
+        elm_object_text_set (content_label, eina_strbuf_string_get (content_text));
+        elm_object_part_content_set (layout, "info_text", content_label);
+
+        eina_strbuf_free (title_text);
+        eina_strbuf_free (content_text);
+    }
+}
+
+void
+MiniControl::set_icon (const char *filepath, const char *group)
+{
+    Evas_Object *img = elm_image_add (layout);
+    if (!img || !layout || !filepath) return;
+    elm_image_file_set (img, filepath, group);
+    evas_object_size_hint_aspect_set (img, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+    elm_object_part_content_set (layout, "keyboard_icon", img);
+}
+
+void
+MiniControl::resize (Evas_Coord w, Evas_Coord h)
+{
+    if (!win) return;
+
+    evas_object_resize (win, w, h);
+}
+
+void
+MiniControl::show ()
+{
+    if (!win) return;
+
+    evas_object_show (win);
+    visibility = true;
+}
+
+void
+MiniControl::hide ()
+{
+    if (!win) return;
+
+    evas_object_hide (win);
+    visibility = false;
+}
+
+void
+MiniControl::rotate (int angle)
+{
+    if (!win) return;
+
+    double scale = elm_config_scale_get ();
+    if (angle == 90 || angle == 270)
+        evas_object_resize (win, MINI_CONTROLLER_WIDTH_LANDSCAPE * scale, MINI_CONTROLLER_HEIGHT * scale);
+    else
+        evas_object_resize (win, MINI_CONTROLLER_WIDTH * scale, MINI_CONTROLLER_HEIGHT * scale);
+}
+
+bool
+MiniControl::get_visibility ()
+{
+    return visibility;
+}
+
+void
+MiniControl::set_selected_callback (Edje_Signal_Cb func, void *data)
+{
+    if (!layout) return;
+
+    elm_object_signal_callback_add (layout, "selected", "edje", func, data);
+}
diff --git a/ism/extras/efl_panel/minicontrol.h b/ism/extras/efl_panel/minicontrol.h
new file mode 100644 (file)
index 0000000..a85678a
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * ISF(Input Service Framework)
+ *
+ * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
+ * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Jihoon Kim <jihoon48.kim@samsung.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 __MINI_CONTROL_H__
+#define __MINI_CONTROL_H__
+
+#include <Elementary.h>
+
+class MiniControl
+{
+public:
+    MiniControl ();
+    ~MiniControl ();
+    bool create (const char *name, const char *file, int angle);
+    void destroy ();
+    void set_text (const char *title, const char *content);
+    void set_icon (const char *filepath, const char *group);
+    void resize (Evas_Coord w, Evas_Coord h);
+    void show ();
+    void hide ();
+    void rotate (int angle);
+    bool get_visibility ();
+    void set_selected_callback (Edje_Signal_Cb func, void *data);
+private:
+    Evas_Object *win;
+    Evas_Object *layout;
+    Eina_Bool    visibility;
+};
+#endif /* __MINI_CONTROL_H__ */
diff --git a/ism/extras/efl_setting/Makefile.am b/ism/extras/efl_setting/Makefile.am
deleted file mode 100644 (file)
index 347cfb9..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES           = *.bak
-
-INCLUDES = -I$(top_builddir) \
-           -I$(top_builddir)/ism/src \
-           -I$(top_srcdir) \
-           -I$(top_srcdir)/ism/src \
-           -I$(top_srcdir)/ism/intl \
-           -I$(top_srcdir)/ism/data \
-           -I$(top_srcdir)/ism/utils \
-           -I$(top_srcdir)/ism/extras/efl_setting/include \
-           -I$(includedir) \
-           -DSCIM_DATADIR=\"@SCIM_DATADIR@\" \
-           -DSCIM_LOCALEDIR=\"@SCIM_LOCALEDIR@\" \
-           -DSCIM_SYSCONFDIR=\"@SCIM_SYSCONFDIR@\" \
-           -DSCIM_LIBEXECDIR=\"@SCIM_LIBEXECDIR@\" \
-           -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
-           -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\" \
-           -DSCIM_TEMPDIR=\"@SCIM_TEMPDIR@\"
-
-
-noinst_HEADERS =
-
-moduledir                       = /usr/ug/lib
-module_LTLIBRARIES              = libug-isfsetting-efl.la
-libug_isfsetting_efl_la_SOURCES = isf_setting_efl.cpp \
-                                  scim_setup_module_efl.cpp \
-                                  ../efl_panel/isf_panel_utility.cpp
-
-libug_isfsetting_efl_la_CXXFLAGS = @EFL_CFLAGS@ \
-                                   @VCONF_CFLAGS@ \
-                                   @UIGADGET_CFLAGS@ \
-                                   @DLOG_CFLAGS@ \
-                                   @PKGMGR_INFO_CFLAGS@ \
-                                   @EFL_ASSIST_CFLAGS@
-
-libug_isfsetting_efl_la_LDFLAGS  = -avoid-version \
-                                   -export-dynamic \
-                                   -rpath $(moduledir)
-
-libug_isfsetting_efl_la_LIBADD  =  @LIBTOOL_EXPORT_OPTIONS@ \
-                                   @LTLIBINTL@ \
-                                   @EFL_LIBS@ \
-                                   @VCONF_LIBS@ \
-                                   @DLOG_LIBS@ \
-                                   @UIGADGET_LIBS@ \
-                                   @PKGMGR_INFO_LIBS@ \
-                                   @EFL_ASSIST_LIBS@ \
-                                   $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
-
diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp
deleted file mode 100755 (executable)
index 0a43da6..0000000
+++ /dev/null
@@ -1,1847 +0,0 @@
-/*
- * ISF(Input Service Framework)
- *
- * ISF is based on SCIM 1.4.7 and extended for supporting more mobile fitable.
- * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
- *
- * Contact: Shuo Liu <shuo0805.liu@samsung.com>, Hengliang Luo <hl.luo@samsung.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 UG_MODULE_API
-#define UG_MODULE_API __attribute__ ((visibility("default")))
-#endif
-
-#define Uses_SCIM_PANEL_AGENT
-#define Uses_SCIM_CONFIG_PATH
-#define Uses_SCIM_HELPER_MODULE
-#define Uses_SCIM_IMENGINE_MODULE
-#define Uses_SCIM_COMPOSE_KEY
-
-#include <stdio.h>
-#include <fstream>
-#include <iostream>
-#include <Elementary.h>
-#include <Ecore_IMF.h>
-#include <Ecore_X.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <vconf-keys.h>
-#include <vconf.h>
-#include <ui-gadget-module.h>
-#include <ui-gadget.h>
-#include <pkgmgr-info.h>
-#include <efl_assist.h>
-#include "scim.h"
-#include "scim_stl_map.h"
-#include "isf_setting_efl.h"
-#include "../efl_panel/isf_panel_utility.h"
-#include "scim_setup_module_efl.h"
-#include "isf_control.h"
-
-using namespace scim;
-using namespace std;
-
-
-#define _EDJ(x)                                   elm_layout_edje_get(x)
-#define ISF_SETTING_EDJ                           (SCIM_DATADIR "/isfsetting.edj")
-#define PADDING_X                                 25
-
-#define SETTING_PACKAGE                           "isfsetting-efl"
-#define SETTING_LOCALEDIR                         "/usr/ug/res/locale"
-#define _T(s)                                     dgettext(SETTING_PACKAGE, s)
-
-#define CSC_FILEPATH                              "/opt/system/csc-default/preset/csc-default-preset.ini"
-
-enum {
-    AUTO_CAPITALIZATION_ITEM = 0,
-    AUTO_CAPITALIZATION_TXT_ITEM,
-    SW_KEYBOARD_GROUP_TITLE_ITEM,
-    SW_KEYBOARD_SEL_ITEM,
-    SW_ISE_OPTION_ITEM,
-    HW_KEYBOARD_GROUP_TITLE_ITEM,
-    HW_KEYBOARD_SEL_ITEM,
-    HW_ISE_OPTION_ITEM,
-    ITEM_TOTAL_COUNT
-};
-
-typedef enum {
-    SEPARATOR_TYPE1,
-    SEPARATOR_TYPE2
-} separator_type;
-
-enum {
-    ITEM_STYLE_NONE,
-    ITEM_STYLE_TOP,
-    ITEM_STYLE_CENTER,
-    ITEM_STYLE_BOTTOM
-};
-
-typedef enum {
-    ISE_OPTION_MODULE_EXIST_SO = 0,
-    ISE_OPTION_MODULE_EXIST_XML,
-    ISE_OPTION_MODULE_NO_EXIST
-} ISE_OPTION_MODULE_STATE;
-
-struct ItemData
-{
-    char *text;
-    char *sub_text;
-    int   mode;
-    int   item_style_type;
-};
-
-static ISE_OPTION_MODULE_STATE      _ise_option_module_stat   = ISE_OPTION_MODULE_NO_EXIST;
-static struct ug_data              *_common_ugd               = NULL;
-static ItemData                    *_p_items[ITEM_TOTAL_COUNT];
-
-static Ecore_X_Window               _root_win;
-static Ecore_X_Atom                 _prop_x_ext_keyboard_exist= 0;
-static Ecore_Event_Handler         *_prop_change_handler      = NULL;
-
-static bool                         _hw_kbd_connected         = false;
-static unsigned int                 _hw_kbd_num               = 0;
-
-static int                          _sw_ise_index             = 0;
-static int                          _sw_ise_index_bak         = 0;
-static int                          _hw_ise_index             = 0;
-static int                          _hw_ise_index_bak         = 0;
-static Evas_Object                 *_sw_radio_grp             = NULL;
-static Evas_Object                 *_hw_radio_grp             = NULL;
-static std::vector<String>          _sw_ise_list;
-static std::vector<String>          _sw_uuid_list;
-static std::vector<String>          _hw_ise_list;
-static std::vector<String>          _hw_uuid_list;
-static std::vector <String>         _setup_modules;
-static String                       _mdl_name;
-
-static SetupModule                 *_mdl                      = NULL;
-
-static Eina_Bool                    _auto_capitalisation      = EINA_FALSE;
-
-static ConfigPointer                _config;
-static Connection                   _reload_signal_connection;
-
-static Ecore_Fd_Handler            *_read_handler             = 0;
-static HelperAgent                  _helper_agent;
-static HelperInfo                   _helper_info ("fd491a70-22f5-11e2-89f3-eb5999be869e", "ISF Setting", "", "", SCIM_HELPER_STAND_ALONE);
-
-static Elm_Genlist_Item_Class       itc1, itc2, itc3, itc4, itc5, itcText, itcTitle, itcSeparator[2];
-
-extern std::vector <String>         _names;
-extern std::vector <String>         _uuids;
-extern std::vector <String>         _module_names;
-extern std::vector <String>         _langs;
-extern std::vector<TOOLBAR_MODE_T>  _modes;
-
-static Evas_Object *_gl_icon_get (void *data, Evas_Object *obj, const char *part);
-static char        *_gl_label_get (void *data, Evas_Object *obj, const char *part);
-static Eina_Bool    _gl_state_get (void *data, Evas_Object *obj, const char *part);
-static void         _gl_del (void *data, Evas_Object *obj);
-static void         _gl_sel (void *data, Evas_Object *obj, void *event_info);
-static void         _gl_sw_ise_sel (void *data, Evas_Object *obj, void *event_info);
-static void         _gl_hw_ise_sel (void *data, Evas_Object *obj, void *event_info);
-static void         _gl_keyboard_sel (void *data, Evas_Object *obj, void *event_info);
-static char        *_gl_exp_sw_label_get (void *data, Evas_Object *obj, const char *part);
-static Evas_Object *_gl_exp_sw_icon_get (void *data, Evas_Object *obj, const char *part);
-
-static void         create_sw_keyboard_selection_view (ug_data *ugd);
-static void         create_hw_keyboard_selection_view (ug_data *ugd);
-
-static char* trim_string (const char *str)
-{
-    Eina_Strbuf *buf = eina_strbuf_new ();
-    char *result;
-
-    eina_strbuf_append (buf, str);
-    eina_strbuf_replace_all (buf, "\r", "");
-    eina_strbuf_replace_all (buf, "\"", "");
-    eina_strbuf_trim (buf);
-
-    result = strdup (eina_strbuf_string_get (buf));
-
-    eina_strbuf_free (buf);
-
-    return result;
-}
-
-static void append_separator (Evas_Object *genlist, separator_type style_type)
-{
-    // Separator
-    Elm_Object_Item *item;
-    item = elm_genlist_item_append (
-            genlist,                // genlist object
-            &itcSeparator[style_type], // item class
-            NULL,                   // data
-            NULL,
-            ELM_GENLIST_ITEM_NONE,
-            NULL,
-            NULL);
-    if (item)
-        elm_genlist_item_select_mode_set (item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-}
-
-static Evas_Object *create_bg (Evas_Object *win)
-{
-    Evas_Object *bg = elm_bg_add (win);
-    evas_object_size_hint_weight_set (bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (bg);
-    return bg;
-}
-
-static Evas_Object *create_fullview (Evas_Object *parent, struct ug_data *ugd)
-{
-    Evas_Object *bg = create_bg (parent);
-    Evas_Object *layout_main = elm_layout_add (parent);
-
-    if (layout_main == NULL)
-        return NULL;
-
-    elm_layout_theme_set (layout_main, "layout", "application", "default");
-    elm_object_style_set (bg, "group_list");
-    elm_object_part_content_set (layout_main, "elm.swallow.bg", bg);
-    evas_object_size_hint_weight_set (layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-    return layout_main;
-}
-
-static Evas_Object *create_naviframe_layout (Evas_Object* parent)
-{
-    Evas_Object *naviframe = elm_naviframe_add (parent);
-    elm_naviframe_prev_btn_auto_pushed_set (naviframe, EINA_FALSE);
-    ea_object_event_callback_add (naviframe, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-    elm_object_part_content_set (parent, "elm.swallow.content", naviframe);
-    evas_object_show (naviframe);
-
-    return naviframe;
-}
-
-static Eina_Bool back_cb (void *data, Elm_Object_Item *it)
-{
-    static bool in_exit = false;
-
-    if (in_exit)
-        return EINA_TRUE;
-    in_exit = true;
-
-    if (data == NULL)
-        return EINA_TRUE;
-
-    struct ug_data *ugd = (struct ug_data *)data;
-    ug_destroy_me (ugd->ug);
-
-    return EINA_TRUE;
-}
-
-static void imeug_destroy_cb (ui_gadget_h ug, void *data)
-{
-    if (!ug) return;
-
-    if (ug)
-        ug_destroy (ug);
-}
-
-static void imeug_layout_cb (ui_gadget_h ug, enum ug_mode mode,
-        void *priv)
-{
-    if (!ug) return;
-
-    Evas_Object *base;
-
-    base = (Evas_Object *) ug_get_layout (ug);
-    if (!base)
-        return;
-
-    switch (mode) {
-        case UG_MODE_FULLVIEW:
-            evas_object_size_hint_weight_set (base, EVAS_HINT_EXPAND,
-                    EVAS_HINT_EXPAND);
-            evas_object_show (base);
-            break;
-        default:
-            break;
-    }
-}
-
-static void launch_setting_plugin_ug_for_ime_setting (const char *ise_uuid)
-{
-    String pkgname = String ("");
-    String mdl_name = String ("");
-    for (unsigned int i = 0; i < _uuids.size (); i++) {
-        if (_uuids[i] == String (ise_uuid)) {
-            mdl_name = _module_names[i];
-            ISFUG_DEBUG ("module name:%s", mdl_name.c_str ());
-            pkgname = mdl_name.substr (0, mdl_name.find_first_of ('.'));
-            break;
-        }
-    }
-
-    struct ug_cbs cbs = {0,};
-    cbs.layout_cb  = imeug_layout_cb;
-    cbs.result_cb  = NULL;
-    cbs.destroy_cb = imeug_destroy_cb;
-    cbs.priv = NULL;
-
-    service_h service = NULL;
-    service_create (&service);
-    service_add_extra_data (service, "pkgname", pkgname.c_str ());
-    ui_gadget_h ug = ug_create (NULL, "setting-plugin-efl", UG_MODE_FULLVIEW, service, &cbs);
-    if (ug == NULL) {
-        ISFUG_DEBUG ("fail to load setting-plugin-efl ug ");
-    }
-    else
-        ISFUG_DEBUG ("load setting-plugin-efl ug successfully");
-
-    service_destroy (service);
-    service = NULL;
-}
-
-static int pkg_list_cb (pkgmgrinfo_appinfo_h handle, void *user_data)
-{
-    char *id = (char *)user_data;
-    char *pkgid = NULL;
-    if (pkgmgrinfo_pkginfo_get_pkgid (handle, &pkgid) != PMINFO_R_OK)
-        return -1;
-
-    if (strcmp (pkgid , id) == 0) {
-        char path[256] = {'\0'};
-        snprintf (path, sizeof (path), "/opt/apps/%s/setting/setting.xml", (char *)(pkgid));
-        if (0 != access(path, R_OK|W_OK|F_OK )) {
-            ISFUG_DEBUG ("/opt/apps/%s/setting/setting.xml not found \n", pkgid);
-            return 0;
-        } else {
-            _ise_option_module_stat = ISE_OPTION_MODULE_EXIST_XML;
-            ISFUG_DEBUG ("/opt/apps/%s/setting/setting.xml exists\n", pkgid);
-            return -1;
-        }
-
-    }
-    else {
-        ISFUG_DEBUG ("%s", pkgid);
-        return 0;
-    }
-}
-
-static ISE_OPTION_MODULE_STATE find_ise_option_module (const char *ise_uuid)
-{
-    ISFUG_DEBUG ("%s", ise_uuid);
-
-    String mdl_name;
-    _ise_option_module_stat = ISE_OPTION_MODULE_NO_EXIST;
-
-    for (unsigned int i = 0; i < _uuids.size (); i++) {
-        if (_uuids[i] == String (ise_uuid)) {
-            if (_modes[i] == TOOLBAR_KEYBOARD_MODE)
-                mdl_name = _module_names[i] + String ("-imengine-setup");
-            else
-                mdl_name = _module_names[i] + String ("-setup");
-        }
-    }
-    _mdl_name = mdl_name;
-    for (unsigned int i = 0; i < _setup_modules.size (); i++) {
-        if (mdl_name == _setup_modules[i]) {
-            _ise_option_module_stat = ISE_OPTION_MODULE_EXIST_SO;
-            goto result;
-        }
-    }
-
-    //if not found , check if there's osp ime directory for it
-    for (unsigned int i = 0; i < _uuids.size (); i++) {
-        if (_uuids[i] == String (ise_uuid)) {
-            int ret = 0;
-            pkgmgrinfo_pkginfo_filter_h handle;
-            ret = pkgmgrinfo_pkginfo_filter_create (&handle);
-            if (ret != PMINFO_R_OK) {
-                ISFUG_DEBUG ("pkgmgrinfo_appinfo_filter_create FAIL");
-                goto result;
-            }
-
-            const bool support_appsetting = true;
-
-            ret = pkgmgrinfo_pkginfo_filter_add_bool (handle, PMINFO_PKGINFO_PROP_PACKAGE_APPSETTING, support_appsetting);
-            if (ret != PMINFO_R_OK) {
-                pkgmgrinfo_pkginfo_filter_destroy (handle);
-                ISFUG_DEBUG ("pkgmgrinfo_pkginfo_filter_add_bool FAIL");
-                goto result;
-            }
-
-            //mdl name is equal the ime appid due to name rule, appid = pkgid.pkgname
-            mdl_name = _module_names[i];
-            String pkgid = mdl_name.substr (0, mdl_name.find_first_of ('.'));
-            ret = pkgmgrinfo_pkginfo_filter_foreach_pkginfo (handle, pkg_list_cb, (void *)(pkgid.c_str ()));
-
-            if (ret != PMINFO_R_OK) {
-                pkgmgrinfo_pkginfo_filter_destroy (handle);
-                ISFUG_DEBUG ("pkgmgrinfo_pkginfo_filter_foreach_appinfo FAIL");
-                goto result;
-            }
-
-            pkgmgrinfo_pkginfo_filter_destroy (handle);
-        }
-    }
-
-result:
-    return _ise_option_module_stat;
-}
-
-static void set_autocap_mode (void)
-{
-    if (vconf_set_bool (VCONFKEY_AUTOCAPITAL_ALLOW_BOOL, _auto_capitalisation) == -1)
-        std::cerr << "Failed to set vconf autocapital\n";
-}
-
-static void update_setting_main_view (ug_data *ugd)
-{
-    if (!ugd)
-        return;
-
-    if (_p_items[SW_KEYBOARD_SEL_ITEM])
-        _p_items[SW_KEYBOARD_SEL_ITEM]->sub_text = strdup (_sw_ise_list[_sw_ise_index].c_str());
-
-    if (ugd->sw_ise_item_tizen)
-        elm_object_item_data_set (ugd->sw_ise_item_tizen, _p_items[SW_KEYBOARD_SEL_ITEM]);
-
-    if (ugd->sw_ise_opt_item_tizen) {
-        if (_hw_kbd_connected || ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_sw_uuid_list[_sw_ise_index].c_str ())))
-            elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_TRUE);
-        else
-            elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_FALSE);
-    }
-
-    if (_p_items[HW_KEYBOARD_SEL_ITEM])
-        _p_items[HW_KEYBOARD_SEL_ITEM]->sub_text = strdup (_hw_ise_list[_hw_ise_index].c_str());
-
-    if (ugd->hw_ise_item_tizen)
-        elm_object_item_data_set (ugd->hw_ise_item_tizen, _p_items[HW_KEYBOARD_SEL_ITEM]);
-
-    if (ugd->hw_ise_opt_item_tizen) {
-        if (!_hw_kbd_connected ||ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_hw_uuid_list[_hw_ise_index].c_str ())))
-            elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, EINA_TRUE);
-        else
-            elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, EINA_FALSE);
-    }
-
-    if (ugd->sw_ise_item_tizen)
-        elm_genlist_item_update (ugd->sw_ise_item_tizen);
-
-    if (ugd->hw_ise_item_tizen)
-        elm_genlist_item_update (ugd->hw_ise_item_tizen);
-}
-
-static void set_active_sw_ise ()
-{
-    if (_sw_ise_index != _sw_ise_index_bak) {
-        isf_control_set_active_ise_by_uuid (_sw_uuid_list[_sw_ise_index].c_str ());
-        _sw_ise_index_bak = _sw_ise_index;
-    }
-}
-
-static Eina_Bool sw_keyboard_selection_view_set_cb (void *data, Elm_Object_Item *it)
-{
-    if (data == NULL)
-        return EINA_TRUE;
-
-    struct ug_data *ugd = (struct ug_data *)data;
-
-    if (!_hw_kbd_connected)
-        set_active_sw_ise ();
-
-    update_setting_main_view (ugd);
-
-    ugd->key_end_cb = back_cb;
-
-    return EINA_TRUE;
-}
-
-static void sw_keyboard_radio_cb (void *data, Evas_Object *obj, void *event_info)
-{
-    int index = GPOINTER_TO_INT (data);
-    elm_radio_value_set (_sw_radio_grp, index);
-    _sw_ise_index = index;
-}
-
-static void hw_keyboard_radio_cb (void *data, Evas_Object *obj, void *event_info)
-{
-    int index = GPOINTER_TO_INT (data);
-    elm_radio_value_set (_hw_radio_grp, index);
-    _hw_ise_index = index;
-}
-
-static Eina_Bool language_view_back_cb (void *data, Elm_Object_Item *it)
-{
-    if (_common_ugd)
-        _common_ugd->key_end_cb = sw_keyboard_selection_view_set_cb;
-
-    return EINA_TRUE;
-}
-
-static void show_language_cb (void *data, Evas_Object *obj, void *event_info)
-{
-    int index = GPOINTER_TO_INT (data);
-    String langlist_str, normal_langlist_str;
-
-    if (!_common_ugd)
-        return;
-
-    for (unsigned int i = 0; i < _uuids.size (); i++) {
-        if (strcmp (_uuids[i].c_str (), _sw_uuid_list[index].c_str ()) == 0)
-            langlist_str = _langs[i];
-    }
-    std::vector<String> langlist_vec,normal_langlist_vec;
-    scim_split_string_list (langlist_vec, langlist_str);
-    normal_langlist_str = ((scim_get_language_name (langlist_vec[0].c_str ())).c_str ());
-    for (unsigned int i = 1; i < langlist_vec.size (); i++) {
-        normal_langlist_str += String (", ");
-        normal_langlist_str += ((scim_get_language_name (langlist_vec[i].c_str ())).c_str ());
-    }
-
-    Evas_Object* layout = elm_layout_add (_common_ugd->naviframe);
-    elm_layout_file_set (layout, ISF_SETTING_EDJ, "isfsetting/languageview");
-
-    Evas_Object *scroller = elm_scroller_add (layout);
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_FALSE);
-    evas_object_size_hint_weight_set (scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-    Evas_Object *label = elm_label_add (layout);
-    elm_label_line_wrap_set (label, ELM_WRAP_WORD);
-
-    Evas_Coord win_w = 0, win_h = 0;
-    ecore_x_window_size_get (ecore_x_window_root_first_get (), &win_w, &win_h);
-    elm_label_wrap_width_set (label, win_w - PADDING_X * 2);
-    elm_object_text_set (label, normal_langlist_str.c_str ());
-    elm_object_content_set (scroller, label);
-    elm_object_part_content_set (layout, "content", scroller);
-
-    // Push the layout along with function buttons and title
-    Elm_Object_Item *it = elm_naviframe_item_push (_common_ugd->naviframe, _sw_ise_list[index].c_str (), NULL, NULL, layout, NULL);
-    elm_naviframe_item_pop_cb_set (it, language_view_back_cb, NULL);
-
-    _common_ugd->key_end_cb = language_view_back_cb;
-}
-
-static void helper_ise_reload_config (void)
-{
-    if (_helper_agent.is_connected ())
-        _helper_agent.reload_config ();
-}
-
-static Eina_Bool ise_option_view_set_cb (void *data, Elm_Object_Item *it)
-{
-    if (!data || !_mdl)
-        return EINA_TRUE;
-
-    struct ug_data *ugd = (struct ug_data *)data;
-    ugd->key_end_cb = back_cb;
-    _mdl->save_config (_config);
-
-    helper_ise_reload_config ();
-
-    return EINA_TRUE;
-}
-
-static void ise_option_show (ug_data *ugd, const char *ise_uuid)
-{
-    if (ISE_OPTION_MODULE_EXIST_SO == find_ise_option_module (ise_uuid)) {
-        char title[256];
-        snprintf (title, sizeof (title), _T("Keyboard settings"));
-
-        if (_mdl) {
-            delete _mdl;
-            _mdl = NULL;
-        }
-
-        if (_mdl_name.length () > 0)
-            _mdl = new SetupModule (String (_mdl_name));
-
-        if (_mdl == NULL || !_mdl->valid ()) {
-            return;
-        } else {
-            _mdl->load_config (_config);
-            ugd->opt_eo = _mdl->create_ui (ugd->layout_main, ugd->naviframe);
-
-            Elm_Object_Item *it = elm_naviframe_item_push (ugd->naviframe, title, NULL, NULL, ugd->opt_eo, NULL);
-            elm_naviframe_item_pop_cb_set (it, ise_option_view_set_cb, ugd);
-
-            ugd->key_end_cb = ise_option_view_set_cb;
-        }
-    }
-    else if (ISE_OPTION_MODULE_EXIST_XML == find_ise_option_module (ise_uuid)) {
-        launch_setting_plugin_ug_for_ime_setting (ise_uuid);
-    }
-}
-
-static char *_gl_text_get (void *data, Evas_Object *obj, const char *part)
-{
-    ItemData *item_data = (ItemData *)data;
-
-    if (item_data)
-        return strdup (item_data->text);
-    else
-        return strdup ("");
-}
-
-static char *_gl_label_get (void *data, Evas_Object *obj, const char *part)
-{
-    ItemData *item_data = (ItemData *)data;
-    if (!item_data)
-        return NULL;
-
-    if (!strcmp (part, "elm.text")) {
-        return strdup (item_data->text);
-    }
-    if (!strcmp (part, "elm.text.1")) {
-        return strdup (item_data->text);
-    }
-    if (!strcmp (part, "elm.text.2")) {
-        return strdup (item_data->sub_text);
-    }
-    return NULL;
-}
-
-static void onoff_check_cb (void *data, Evas_Object *obj, void *event_info)
-{
-    int id = (int)(data);
-
-    if (id == AUTO_CAPITALIZATION_ITEM) {
-        _auto_capitalisation = (_auto_capitalisation == EINA_TRUE ? EINA_FALSE : EINA_TRUE);
-        set_autocap_mode ();
-    }
-}
-
-static Evas_Object *_gl_icon_get (void *data, Evas_Object *obj, const char *part)
-{
-    ItemData *item_data = (ItemData *)data;
-    if (!item_data)
-        return NULL;
-
-    if (!strcmp (part, "elm.icon")) {
-        Evas_Object *onoff_ck = elm_check_add (obj);
-        elm_object_style_set (onoff_ck, "on&off");
-        evas_object_smart_callback_add (onoff_ck, "changed", onoff_check_cb, (void *) (item_data->mode));
-        evas_object_propagate_events_set (onoff_ck, EINA_FALSE);
-        if (item_data->mode == AUTO_CAPITALIZATION_ITEM) {
-            elm_check_state_set (onoff_ck, _auto_capitalisation);
-        }
-        return onoff_ck;
-    }
-
-    return NULL;
-}
-
-static Eina_Bool _gl_state_get (void *data, Evas_Object *obj, const char *part)
-{
-    return EINA_FALSE;
-}
-
-static void _gl_del (void *data, Evas_Object *obj)
-{
-}
-
-static void _gl_sw_ise_del (void *data, Evas_Object *obj)
-{
-    _sw_radio_grp = NULL;
-}
-
-static void _gl_sw_ise_sel (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-    if (!item)
-        return;
-
-    elm_genlist_item_selected_set (item, EINA_FALSE);
-
-    _sw_ise_index = (int)(data);
-
-    elm_genlist_item_update (item);
-}
-
-static void _gl_hw_ise_sel (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-    if (!item)
-        return;
-
-    elm_genlist_item_selected_set (item, EINA_FALSE);
-
-    _hw_ise_index = (int)(data);
-
-    elm_genlist_item_update (item);
-}
-
-static void _gl_sel (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-    if (!item)
-        return;
-
-    elm_genlist_item_selected_set (item, EINA_FALSE);
-
-    int id = (int)(data);
-
-    if (id == AUTO_CAPITALIZATION_ITEM) {
-        _auto_capitalisation = (_auto_capitalisation == EINA_TRUE ? EINA_FALSE : EINA_TRUE);
-        set_autocap_mode ();
-    }
-
-    elm_genlist_item_update (item);
-}
-
-static void _gl_keyboard_sel (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-    ug_data *ugd = (ug_data *)data;
-
-    if (!item || !ugd)
-        return;
-
-    if (item == ugd->sw_ise_item_tizen)
-        create_sw_keyboard_selection_view (ugd);
-    if (item == ugd->hw_ise_item_tizen)
-        create_hw_keyboard_selection_view (ugd);
-    elm_genlist_item_selected_set (item, EINA_FALSE);
-}
-
-static void _gl_ise_option_sel (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-    ug_data *ugd = (ug_data *)data;
-    if (!item || !ugd)
-        return;
-
-    String ise_uuid = String ("");
-    if (item == ugd->sw_ise_opt_item_tizen)
-        ise_uuid = _sw_uuid_list[_sw_ise_index];
-    else
-        ise_uuid = _hw_uuid_list[_hw_ise_index];
-    ise_option_show (ugd, ise_uuid.c_str ());
-    elm_genlist_item_selected_set (item, EINA_FALSE);
-}
-
-static char *_gl_exp_sw_label_get (void *data, Evas_Object *obj, const char *part)
-{
-    int index = (int)(data);
-    if (!strcmp (part, "elm.text")) {
-        return strdup (_sw_ise_list[index].c_str ());
-    }
-    return NULL;
-}
-
-static Evas_Object *_gl_exp_sw_icon_get (void *data, Evas_Object *obj, const char *part)
-{
-    int index = (int)(data);
-    if (!strcmp (part, "elm.icon.1")) {
-        Evas_Object *radio = elm_radio_add (obj);
-        elm_radio_state_value_set (radio, index);
-        if (_sw_radio_grp == NULL)
-            _sw_radio_grp = elm_radio_add (obj);
-        elm_radio_group_add (radio, _sw_radio_grp);
-        evas_object_show (radio);
-        evas_object_smart_callback_add (radio, "changed", sw_keyboard_radio_cb, (void *) (index));
-        if (_sw_ise_index == index) {
-            elm_radio_value_set (_sw_radio_grp, _sw_ise_index);
-        }
-        return radio;
-    }
-    if (!strcmp (part, "elm.icon.2")) {
-        Evas_Object *icon = elm_button_add (obj);
-        elm_object_style_set (icon, "reveal");
-        evas_object_smart_callback_add (icon, "clicked", show_language_cb, (void *)(index));
-        evas_object_propagate_events_set (icon, EINA_FALSE); // Not propagate to genlist item.
-        return icon;
-    }
-    return NULL;
-}
-
-static void _gl_exp_sw_realized (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *it = (Elm_Object_Item *)event_info;
-    int index;
-
-    if (!it) return;
-
-    index = (int)elm_object_item_data_get (it);
-
-    if (_sw_ise_list.size () < 2)
-        return;
-
-    if (index == 0)
-        elm_object_item_signal_emit (it, "elm,state,top", "");
-    else if (index == (int)(_sw_ise_list.size () - 1))
-        elm_object_item_signal_emit (it, "elm,state,bottom", "");
-    else
-        elm_object_item_signal_emit (it, "elm,state,center", "");
-}
-
-static void _gl_hw_ise_del (void *data, Evas_Object *obj)
-{
-    _hw_radio_grp = NULL;
-}
-
-static char *_gl_exp_hw_label_get (void *data, Evas_Object *obj, const char *part)
-{
-    int index = (int)(data);
-    if (!strcmp (part, "elm.text")) {
-        return strdup (_hw_ise_list[index].c_str ());
-    }
-    return NULL;
-}
-
-static Evas_Object *_gl_exp_hw_icon_get (void *data, Evas_Object *obj, const char *part)
-{
-    if (!strcmp (part, "elm.icon")) {
-        int index = (int)(data);
-        Evas_Object *radio = elm_radio_add (obj);
-        elm_radio_state_value_set (radio, index);
-        if (_hw_radio_grp == NULL)
-            _hw_radio_grp = elm_radio_add (obj);
-        elm_radio_group_add (radio, _hw_radio_grp);
-        evas_object_show (radio);
-        evas_object_smart_callback_add (radio, "changed", hw_keyboard_radio_cb, (void *) (index));
-        if (_hw_ise_index == index) {
-            elm_radio_value_set (_hw_radio_grp, _hw_ise_index);
-        }
-        return radio;
-    }
-    return NULL;
-}
-
-static void _gl_exp_hw_realized (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *it = (Elm_Object_Item *)event_info;
-    int index;
-
-    if (!it) return;
-
-    index = (int)elm_object_item_data_get (it);
-
-    if (_hw_ise_list.size () < 2)
-        return;
-
-    if (index == 0)
-        elm_object_item_signal_emit (it, "elm,state,top", "");
-    else if (index == (int)(_hw_ise_list.size () - 1))
-        elm_object_item_signal_emit (it, "elm,state,bottom", "");
-    else
-        elm_object_item_signal_emit (it, "elm,state,center", "");
-}
-
-static void _gl_realized (void *data, Evas_Object *obj, void *event_info)
-{
-    Elm_Object_Item *it = (Elm_Object_Item *)event_info;
-    ItemData *item_data;
-
-    if (!it) return;
-
-    item_data = (ItemData *)elm_object_item_data_get (it);
-    if (!item_data) return;
-
-    switch (item_data->item_style_type) {
-        case ITEM_STYLE_TOP:
-            elm_object_item_signal_emit (it, "elm,state,top", "");
-            break;
-        case ITEM_STYLE_BOTTOM:
-            elm_object_item_signal_emit (it, "elm,state,bottom", "");
-            break;
-        case ITEM_STYLE_CENTER:
-            elm_object_item_signal_emit (it, "elm,state,center", "");
-            break;
-        default:
-            break;
-    }
-}
-
-static void create_sw_keyboard_selection_view (ug_data *ugd)
-{
-    if (!ugd)
-        return;
-
-    ugd->key_end_cb = sw_keyboard_selection_view_set_cb;
-
-    if (_sw_radio_grp != NULL) {
-        evas_object_del (_sw_radio_grp);
-        _sw_radio_grp = NULL;
-    }
-
-    Evas_Object *genlist = elm_genlist_add (ugd->naviframe);
-    evas_object_smart_callback_add (genlist, "realized", _gl_exp_sw_realized, NULL);
-    elm_object_style_set (genlist, "dialogue");
-    evas_object_show (genlist);
-
-    // Push the layout along with function buttons and title
-    Elm_Object_Item *it = elm_naviframe_item_push (ugd->naviframe, _T("Keyboard selection"), NULL, NULL, genlist, NULL);
-    elm_naviframe_item_pop_cb_set (it, sw_keyboard_selection_view_set_cb, ugd);
-
-    unsigned int i = 0;
-
-    if (_sw_ise_list.size () > 0) {
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE1);
-    }
-
-    // Set item class for text + radio button
-    itc4.item_style       = "dialogue/1text.2icon.2";
-    itc4.func.text_get    = _gl_exp_sw_label_get;
-    itc4.func.content_get = _gl_exp_sw_icon_get;
-    itc4.func.state_get   = _gl_state_get;
-    itc4.func.del         = _gl_sw_ise_del;
-    for (i = 0; i < _sw_ise_list.size (); i++) {
-        elm_genlist_item_append (genlist, &itc4, (void *)(i), NULL, ELM_GENLIST_ITEM_NONE, _gl_sw_ise_sel, (void *)(i));
-    }
-}
-
-static void set_active_hw_ise (void)
-{
-    if (_hw_ise_index_bak != _hw_ise_index) {
-        isf_control_set_active_ise_by_uuid(_hw_uuid_list[_hw_ise_index].c_str());
-        _hw_ise_index_bak = _hw_ise_index;
-    }
-}
-
-static Eina_Bool hw_keyboard_selection_view_set_cb (void *data, Elm_Object_Item *it)
-{
-    if (!data)
-        return EINA_TRUE;
-
-    struct ug_data *ugd = (struct ug_data *)data;
-
-    if (_hw_kbd_connected)
-        set_active_hw_ise ();
-
-    update_setting_main_view (ugd);
-
-    ugd->key_end_cb = back_cb;
-
-    return EINA_TRUE;
-}
-
-static void create_hw_keyboard_selection_view (ug_data * ugd)
-{
-    if (!ugd)
-        return;
-
-    ugd->key_end_cb = hw_keyboard_selection_view_set_cb;
-
-    if (_hw_radio_grp != NULL) {
-        evas_object_del (_hw_radio_grp);
-        _hw_radio_grp = NULL;
-    }
-
-    Evas_Object *genlist = elm_genlist_add (ugd->naviframe);
-    elm_object_style_set (genlist, "dialogue");
-    evas_object_smart_callback_add (genlist, "realized", _gl_exp_hw_realized, NULL);
-    evas_object_show (genlist);
-
-    // Push the layout along with function buttons and title
-    Elm_Object_Item *nf_it = elm_naviframe_item_push (ugd->naviframe, _T("Keyboard selection"), NULL, NULL, genlist, NULL);
-    elm_naviframe_item_pop_cb_set (nf_it, hw_keyboard_selection_view_set_cb, ugd);
-
-    unsigned int i = 0;
-
-    if (_hw_ise_list.size () > 0) {
-        // Seperator
-        append_separator (genlist, SEPARATOR_TYPE1);
-    }
-
-    // Set item class for text + radio button)
-    itc5.item_style       = "dialogue/1text.1icon.2";
-    itc5.func.text_get    = _gl_exp_hw_label_get;
-    itc5.func.content_get = _gl_exp_hw_icon_get;
-    itc5.func.state_get   = _gl_state_get;
-    itc5.func.del         = _gl_hw_ise_del;
-    for (i = 0; i < _hw_ise_list.size (); i++) {
-        elm_genlist_item_append (genlist, &itc5, (void *)(i), NULL, ELM_GENLIST_ITEM_NONE, _gl_hw_ise_sel, (void *)(i));
-    }
-}
-
-static Elm_Object_Item *nf_main_it = NULL;
-static Evas_Object *create_setting_main_view (ug_data *ugd)
-{
-    Elm_Object_Item *item     = NULL;
-
-    if (!ugd)
-        return NULL;
-
-    if (ugd->naviframe == NULL) {
-        ugd->naviframe  = create_naviframe_layout (ugd->layout_main);
-        ugd->key_end_cb = back_cb;
-
-        Evas_Object *genlist = elm_genlist_add (ugd->naviframe);
-        elm_object_style_set (genlist, "dialogue");
-        evas_object_smart_callback_add (genlist, "realized", _gl_realized, NULL);
-        elm_genlist_mode_set (genlist, ELM_LIST_COMPRESS);
-        // Set item class for 1text.1icon (text+radiobutton)
-        itc1.item_style       = "dialogue/1text.1icon";
-        itc1.func.text_get    = _gl_label_get;
-        itc1.func.content_get = _gl_icon_get;
-        itc1.func.state_get   = _gl_state_get;
-        itc1.func.del         = _gl_del;
-
-        // Set item class for 2text (text+subtext)
-        itc2.item_style       = "dialogue/2text.3";
-        itc2.func.text_get    = _gl_label_get;
-        itc2.func.content_get = NULL;
-        itc2.func.state_get   = _gl_state_get;
-        itc2.func.del         = _gl_del;
-
-        // Set item class for normal text (text)
-        itc3.item_style       = "dialogue/1text";
-        itc3.func.text_get    = _gl_label_get;
-        itc3.func.content_get = NULL;
-        itc3.func.state_get   = _gl_state_get;
-        itc3.func.del         = _gl_del;
-
-        // Set item class for dialogue group seperator
-        itcSeparator[SEPARATOR_TYPE1].item_style       = "dialogue/separator";
-        itcSeparator[SEPARATOR_TYPE1].func.text_get    = NULL;
-        itcSeparator[SEPARATOR_TYPE1].func.content_get = NULL;
-        itcSeparator[SEPARATOR_TYPE1].func.state_get   = NULL;
-        itcSeparator[SEPARATOR_TYPE1].func.del         = NULL;
-
-        itcSeparator[SEPARATOR_TYPE2].item_style       = "dialogue/separator.2";
-        itcSeparator[SEPARATOR_TYPE2].func.text_get    = NULL;
-        itcSeparator[SEPARATOR_TYPE2].func.content_get = NULL;
-        itcSeparator[SEPARATOR_TYPE2].func.state_get   = NULL;
-        itcSeparator[SEPARATOR_TYPE2].func.del         = NULL;
-
-        // Set item class for dialogue group title
-        itcTitle.item_style       = "dialogue/grouptitle";
-        itcTitle.func.text_get    = _gl_label_get;
-        itcTitle.func.content_get = NULL;
-        itcTitle.func.state_get   = _gl_state_get;
-        itcTitle.func.del         = _gl_del;
-
-        itcText.item_style       = "multiline/1text";
-        itcText.func.text_get    = _gl_text_get;
-        itcText.func.content_get = NULL;
-        itcText.func.state_get   = _gl_state_get;
-        itcText.func.del         = _gl_del;
-
-        //==================================group begin =======================
-        ItemData *item_data = NULL;
-
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE1);
-
-        // Group1 item1
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[AUTO_CAPITALIZATION_ITEM] = item_data;
-            item_data->text = strdup (_T("Auto capitalization"));
-            item_data->mode = AUTO_CAPITALIZATION_ITEM;
-            ugd->autocapital_item = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itc1,                  // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    _gl_sel,
-                    (void *)(item_data->mode));
-
-            if (_hw_kbd_connected)
-                elm_object_item_disabled_set (ugd->autocapital_item, EINA_TRUE);
-        }
-
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE2);
-
-        // Text
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[AUTO_CAPITALIZATION_TXT_ITEM] = item_data;
-            item_data->text = strdup (_T("Automatically capitalize first letter of sentence"));
-            item = elm_genlist_item_append (
-                    genlist,                                // genlist object
-                    &itcText,                               // item class
-                    item_data,                              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    NULL,
-                    NULL);
-            elm_genlist_item_select_mode_set (item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-        }
-
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE1);
-
-        // Group2 title
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[SW_KEYBOARD_GROUP_TITLE_ITEM] = item_data;
-            item_data->text = strdup (_T("Software keyboard"));
-            item = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itcTitle,              // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    NULL,
-                    NULL);
-            elm_genlist_item_select_mode_set (item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-        }
-
-        // Group2 item1
-        std::vector<String> ise_names;
-
-        String ise_uuid = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String (""));
-        if (ise_uuid == String ("")) {
-            ISFUG_ERROR("get SCIM_CONFIG_DEFAULT_HELPER_ISE fail");
-            //one more chance
-            ise_uuid = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String (""));
-        }
-        for (unsigned int i = 0; i < _sw_uuid_list.size(); i ++)
-        {
-            if (ise_uuid == _sw_uuid_list[i]) {
-                _sw_ise_index = i;
-                break;
-            }
-        }
-
-        _sw_ise_index_bak = _sw_ise_index;
-
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[SW_KEYBOARD_SEL_ITEM] = item_data;
-            item_data->text = strdup (_T("Keyboard selection"));
-            item_data->sub_text = strdup (_sw_ise_list[_sw_ise_index].c_str());
-            item_data->item_style_type = ITEM_STYLE_TOP;
-
-            ugd->sw_ise_item_tizen = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itc2,                  // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    _gl_keyboard_sel,
-                    (void *)ugd);
-
-            if (_hw_kbd_connected)
-                elm_object_item_disabled_set (ugd->sw_ise_item_tizen, EINA_TRUE);
-        }
-
-        // Group2 item2
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[SW_ISE_OPTION_ITEM] = item_data;
-            item_data->text = strdup (_T("Keyboard settings"));
-            item_data->mode = SW_ISE_OPTION_ITEM;
-            item_data->item_style_type = ITEM_STYLE_BOTTOM;
-            ugd->sw_ise_opt_item_tizen = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itc3,                  // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    _gl_ise_option_sel,
-                    (void *)ugd);
-
-            if (_hw_kbd_connected ||ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_sw_uuid_list[_sw_ise_index].c_str ())))
-                elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_TRUE);
-        }
-
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE1);
-
-        // Group3 title
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[HW_KEYBOARD_GROUP_TITLE_ITEM] = item_data;
-            item_data->text = strdup (_T("Hardware keyboard"));
-            item = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itcTitle,              // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    NULL,
-                    NULL);
-            elm_genlist_item_select_mode_set (item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-        }
-
-        // Group3 item1
-        uint32 option = 0;
-        String uuid, name;
-        isf_get_keyboard_ise (_config, uuid, name, option);
-        for (unsigned int i = 0; i < _hw_uuid_list.size(); i ++)
-        {
-            if (uuid == _hw_uuid_list[i]) {
-                _hw_ise_index = i;
-                break;
-            }
-        }
-
-        if (option & SCIM_IME_NOT_SUPPORT_HARDWARE_KEYBOARD) {
-            std::cerr << "    Keyboard ISE (" << _hw_ise_list[_hw_ise_index].c_str() << ") can not support hardware keyboard!!!\n";
-
-            uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
-            isf_get_keyboard_ise (_config, uuid, name, option);
-
-            for (unsigned int i = 0; i < _hw_uuid_list.size(); i ++)
-            {
-                if (uuid == _hw_uuid_list[i]) {
-                    _hw_ise_index = i;
-                    break;
-                }
-            }
-
-        }
-        _hw_ise_index_bak = _hw_ise_index;
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[HW_KEYBOARD_SEL_ITEM] = item_data;
-            item_data->text     = strdup (_T("Keyboard selection"));
-            item_data->sub_text = strdup ( _hw_ise_list[_hw_ise_index].c_str());
-            item_data->item_style_type = ITEM_STYLE_TOP;
-            ugd->hw_ise_item_tizen = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itc2,                  // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    _gl_keyboard_sel,
-                    (void *)ugd);
-
-            if (!_hw_kbd_connected)
-                elm_object_item_disabled_set (ugd->hw_ise_item_tizen, EINA_TRUE);
-        }
-        // Group3 item2
-        item_data = (ItemData *)malloc (sizeof (ItemData));
-        if (item_data != NULL) {
-            memset (item_data, 0, sizeof (ItemData));
-            _p_items[HW_ISE_OPTION_ITEM] = item_data;
-            item_data->text = strdup (_T("Keyboard settings"));
-            item_data->mode = HW_ISE_OPTION_ITEM;
-            item_data->item_style_type = ITEM_STYLE_BOTTOM;
-            ugd->hw_ise_opt_item_tizen = elm_genlist_item_append (
-                    genlist,                // genlist object
-                    &itc3,                  // item class
-                    item_data,              // data
-                    NULL,
-                    ELM_GENLIST_ITEM_NONE,
-                    _gl_ise_option_sel,
-                    (void *)ugd);
-
-            if (!_hw_kbd_connected || ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_hw_uuid_list[_hw_ise_index].c_str ())))
-                elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, EINA_TRUE);
-        }
-
-        // Separator
-        append_separator (genlist, SEPARATOR_TYPE1);
-
-        //==================================group end =========================
-        Evas_Object *back_btn = elm_button_add (ugd->naviframe);
-        elm_object_style_set (back_btn, "naviframe/back_btn/default");
-        nf_main_it = elm_naviframe_item_push (ugd->naviframe, _T("Keyboard"), back_btn, NULL, genlist, NULL);
-        elm_naviframe_item_pop_cb_set (nf_main_it, back_cb, ugd);
-    }
-    return ugd->naviframe;
-}
-
-static void update_ise_list (void)
-{
-    // Request ISF to update ISE list, below codes are very important, do not remove
-    char **iselist = NULL;
-    int count = isf_control_get_ise_list (&iselist);
-
-    for (int i = 0; i < count; i++) {
-        SCIM_DEBUG_MAIN (3) << " [" << i << " : " << iselist[i] << "] \n";
-        delete [] (iselist[i]);
-    }
-    if (iselist != NULL)
-        free (iselist);
-}
-
-static void load_config_data (ConfigPointer config)
-{
-    int tmp_cap    = 0;
-    vconf_get_bool (VCONFKEY_AUTOCAPITAL_ALLOW_BOOL, &tmp_cap);
-    if (tmp_cap == true)
-        _auto_capitalisation = EINA_TRUE;
-}
-
-static void load_config_module (void)
-{
-    _config = ConfigBase::get (true, "socket");
-    if (_config.null ()) {
-        std::cerr << "Create dummy config!!!\n";
-        _config = new DummyConfig ();
-    }
-
-    if (_config.null ()) {
-        std::cerr << "Can not create Config Object!\n";
-    }
-}
-
-static void hw_connection_change_cb (ug_data *ugd)
-{
-    if (!ugd) return;
-
-    // enable/disable switch
-    if (ugd->autocapital_item)
-        elm_object_item_disabled_set (ugd->autocapital_item, !elm_object_item_disabled_get (ugd->autocapital_item));
-
-    if (ugd->sw_ise_item_tizen)
-        elm_object_item_disabled_set (ugd->sw_ise_item_tizen, _hw_kbd_connected);
-
-    if (ugd->hw_ise_item_tizen)
-        elm_object_item_disabled_set (ugd->hw_ise_item_tizen, !_hw_kbd_connected);
-
-    if (ugd->sw_ise_opt_item_tizen) {
-        if (_hw_kbd_connected || ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_sw_uuid_list[_sw_ise_index].c_str ())))
-            elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_TRUE);
-        else
-            elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_FALSE);
-    }
-
-    if (ugd->hw_ise_opt_item_tizen) {
-        if (!_hw_kbd_connected || ISE_OPTION_MODULE_NO_EXIST == find_ise_option_module ((const char *)(_hw_uuid_list[_hw_ise_index].c_str ())))
-            elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, EINA_TRUE);
-        else
-            elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, EINA_FALSE);
-    }
-
-    if (!_hw_kbd_connected) {
-        String uuid = _sw_uuid_list[_sw_ise_index];
-        isf_control_set_active_ise_by_uuid (uuid.c_str ());
-    }
-
-    if (ugd->naviframe) {
-        if (ugd->key_end_cb == hw_keyboard_selection_view_set_cb) {
-            // H/W keyboard selection view
-            if (!_hw_kbd_connected)
-                elm_naviframe_item_pop (ugd->naviframe);
-        }
-        else if (ugd->key_end_cb == sw_keyboard_selection_view_set_cb) {
-            // S/W keyboard selection view
-            if (_hw_kbd_connected)
-                elm_naviframe_item_pop (ugd->naviframe);
-        }
-        else if (ugd->key_end_cb == ise_option_view_set_cb || ugd->key_end_cb == language_view_back_cb) {
-            // ISE or IMEngine option view or language display view
-            Elm_Object_Item *top_it = elm_naviframe_top_item_get (ugd->naviframe);
-            if (top_it != nf_main_it) {
-                elm_naviframe_item_pop_to (nf_main_it);
-            }
-        }
-        ugd->key_end_cb = back_cb;
-    }
-}
-
-static Eina_Bool x_window_property_change_cb (void *data, int ev_type, void *ev)
-{
-    Ecore_X_Event_Window_Property *event = (Ecore_X_Event_Window_Property *)ev;
-    unsigned int val = 0;
-
-    if (!event || event->win != _root_win || event->atom != _prop_x_ext_keyboard_exist)
-        return ECORE_CALLBACK_PASS_ON;
-
-    if (!ecore_x_window_prop_card32_get (event->win, _prop_x_ext_keyboard_exist, &val, 1) > 0)
-        return ECORE_CALLBACK_PASS_ON;
-
-    if (val != 0)
-        _hw_kbd_connected = true;
-    else
-        _hw_kbd_connected = false;
-
-    ug_data *ugd = (ug_data *)data;
-    hw_connection_change_cb (ugd);
-    _hw_kbd_num = val;
-
-    return ECORE_CALLBACK_PASS_ON;
-}
-
-static void init_hw_keyboard_listener (ug_data *ugd)
-{
-    if (_prop_change_handler)
-        return;
-
-    _root_win = ecore_x_window_root_first_get ();
-    ecore_x_event_mask_set (_root_win, ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
-
-    _prop_change_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_PROPERTY, x_window_property_change_cb, (void *)ugd);
-
-    if (!_prop_x_ext_keyboard_exist)
-        _prop_x_ext_keyboard_exist = ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST);
-
-    if (!ecore_x_window_prop_card32_get (_root_win, _prop_x_ext_keyboard_exist, &_hw_kbd_num, 1)) {
-        std::cerr << "ecore_x_window_prop_card32_get () is failed!!!\n";
-        return;
-    }
-
-    if (_hw_kbd_num == 0)
-        _hw_kbd_connected = false;
-    else
-        _hw_kbd_connected = true;
-}
-
-static void sort_sw_ise ()
-{
-    std::sort (_sw_ise_list.begin (), _sw_ise_list.end ());
-    //decoupling name and uuid
-    std::vector<String> sw_ise_list;
-    for (unsigned int i = 0; i < _sw_ise_list.size() ; i++) {
-        String str_name_uuid = _sw_ise_list[i];
-        std::vector<String> vtmp;
-        scim_split_string_list (vtmp, str_name_uuid, ':');
-        sw_ise_list.push_back(vtmp[0]);//name
-        _sw_uuid_list.push_back(vtmp[1]);//uuid
-    }
-
-    _sw_ise_list.clear();
-    for (unsigned int j = 0; j < sw_ise_list.size(); j ++)
-        _sw_ise_list.push_back(sw_ise_list[j]);
-}
-
-static void sort_hw_ise ()
-{
-    std::sort (_hw_ise_list.begin (), _hw_ise_list.end ());
-    //decoupling name and uuid
-    std::vector<String> hw_ise_list;
-    for (unsigned int i = 0; i < _hw_ise_list.size() ; i++) {
-        String str_name_uuid = _hw_ise_list[i];
-        std::vector<String> vtmp;
-        scim_split_string_list (vtmp, str_name_uuid, ':');
-        hw_ise_list.push_back(vtmp[0]);//name
-        _hw_uuid_list.push_back(vtmp[1]);//uuid
-    }
-
-    _hw_ise_list.clear();
-    for (unsigned int j = 0; j < hw_ise_list.size(); j ++)
-        _hw_ise_list.push_back(hw_ise_list[j]);
-}
-
-static bool load_ise_info ()
-{
-    isf_load_ise_information (ALL_ISE, _config);
-
-    std::vector<String> all_langs, sw_uuid_list, hw_uuid_list;
-    _sw_ise_list.clear ();
-    isf_get_all_languages (all_langs);
-    std::vector<String> sw_ise_list;
-    isf_get_helper_ises_in_languages (all_langs, sw_uuid_list, sw_ise_list);
-    if (sw_uuid_list.size() == 0)
-        return false;
-    //compose name and uuid .
-    for (unsigned int i = 0 ; i < sw_uuid_list.size(); i ++) {
-        String name =  sw_ise_list [i];
-        String uuid = sw_uuid_list[i];
-        String str_name_uuid  = String(name) + String (":") + String(uuid);
-        _sw_ise_list.push_back(str_name_uuid);
-    }
-    sort_sw_ise();
-
-    _hw_ise_list.clear ();
-    std::vector<String> hw_ise_list;
-    isf_get_keyboard_ises_in_languages (all_langs, hw_uuid_list, hw_ise_list);
-    if (hw_uuid_list.size() == 0)
-        return false;
-    //compose name and uuid .
-    for ( unsigned int i = 0 ; i < hw_uuid_list.size(); i ++) {
-        String name =  hw_ise_list [i];
-        String uuid = hw_uuid_list[i];
-        String str_name_uuid  = String(name) + String (":") + String(uuid);
-        _hw_ise_list.push_back(str_name_uuid);
-    }
-    sort_hw_ise();
-    return true;
-}
-
-/**
- * @brief Reload config slot function for HelperAgent.
- *
- * @param ic The context of application.
- * @param ise_uuid The ISE uuid.
- *
- * @return void
- */
-static void slot_reload_config (const HelperAgent *, int ic, const String &ise_uuid)
-{
-    uint32 option = 0;
-    String uuid, name;
-    isf_get_keyboard_ise (_config, uuid, name, option);
-    for (unsigned int i = 0; i < _hw_uuid_list.size (); i ++) {
-        if (uuid == _hw_uuid_list[i]) {
-            _hw_ise_index = i;
-            break;
-        }
-    }
-
-    _hw_ise_index_bak = _hw_ise_index;
-    update_setting_main_view (_common_ugd);
-    ISFUG_DEBUG ("keyboard ISE: %s", name.c_str ());
-}
-
-/**
- * @brief Handler function for HelperAgent input.
- *
- * @param user_data Data to pass when it is called.
- * @param fd_handler The Ecore Fd handler.
- *
- * @return ECORE_CALLBACK_RENEW
- */
-static Eina_Bool helper_agent_input_handler (void *user_data, Ecore_Fd_Handler *fd_handler)
-{
-    if (fd_handler == _read_handler && _helper_agent.has_pending_event ()) {
-        if (!_helper_agent.filter_event ()) {
-            std::cerr << "helper_agent.filter_event () is failed!!!\n";
-        }
-    } else {
-        std::cerr << "helper_agent.has_pending_event () is failed!!!\n";
-    }
-
-    return ECORE_CALLBACK_RENEW;
-}
-
-static void *on_create (ui_gadget_h ug, enum ug_mode mode, service_h s, void *priv)
-{
-    ISFUG_DEBUG ("create ug");
-    Evas_Object *parent  = NULL;
-    Evas_Object *content = NULL;
-
-    if (ug == NULL || priv == NULL)
-        return NULL;
-
-    load_config_module ();
-    update_ise_list ();
-    bool loaded = load_ise_info();
-    if (!loaded) {
-        ISFUG_ERROR("load_ise_info() fail");
-        return NULL;
-    }
-
-    bindtextdomain (SETTING_PACKAGE, SETTING_LOCALEDIR);
-    struct ug_data *ugd = (struct ug_data *)priv;
-    ugd->ug = ug;
-    parent = (Evas_Object *) ug_get_parent_layout (ug);
-    if (parent == NULL)
-        return NULL;
-
-    load_config_data (_config);
-    scim_get_setup_module_list (_setup_modules);
-    init_hw_keyboard_listener (ugd);
-
-    /* Connect PanelAgent by HelperAgent */
-    String display_name = String (":13");
-    const char *p = getenv ("DISPLAY");
-    if (p != NULL)
-        display_name = String (p);
-
-    _reload_signal_connection = _helper_agent.signal_connect_reload_config (slot (slot_reload_config));
-    int id = _helper_agent.open_connection (_helper_info, display_name);
-    if (id == -1) {
-        std::cerr << "    open_connection failed!!!!!!\n";
-    } else {
-        int fd = _helper_agent.get_connection_number ();
-        if (fd >= 0)
-            _read_handler = ecore_main_fd_handler_add (fd, ECORE_FD_READ, helper_agent_input_handler, NULL, NULL, NULL);
-    }
-
-    //-------------------------- ise information ----------------------------
-
-    // Create keyboard setting UI
-    ugd->layout_main = create_fullview (parent, ugd);
-
-    if (ugd->layout_main != NULL) {
-        content = create_setting_main_view (ugd);
-        evas_object_data_set (content, "ugd", ugd);
-        evas_object_show (content);
-        evas_object_show (ugd->layout_main);
-    }
-    return (void *)ugd->layout_main;
-}
-
-static void on_start (ui_gadget_h ug, service_h s, void *priv)
-{
-}
-
-static void on_pause (ui_gadget_h ug, service_h s, void *priv)
-{
-    if (ug == NULL || priv == NULL)
-        return;
-    struct ug_data *ugd = (struct ug_data *) priv;
-    if (ugd->key_end_cb == ise_option_view_set_cb) {    //inside ise setup module
-        _mdl->save_config (_config);
-        helper_ise_reload_config ();
-    } else if (ugd->key_end_cb == sw_keyboard_selection_view_set_cb) {
-        set_active_sw_ise ();
-    } else if (ugd->key_end_cb == hw_keyboard_selection_view_set_cb) {
-        set_active_hw_ise ();
-    }
-}
-
-static void on_resume (ui_gadget_h ug, service_h s, void *priv)
-{
-    if (ug == NULL || priv == NULL)
-        return;
-
-    if (_mdl != NULL) {
-        _mdl->query_changed ();
-    }
-
-    slot_reload_config (NULL, 0, String (""));
-}
-
-static void on_destroy (ui_gadget_h ug, service_h s, void *priv)
-{
-    ISFUG_DEBUG ("destroy ug");
-    if (ug == NULL || priv == NULL)
-        return;
-
-    struct ug_data *ugd = (struct ug_data *) priv;
-
-    if (ugd->naviframe != NULL) {
-        evas_object_del (ugd->naviframe);
-        ugd->naviframe = NULL;
-    }
-
-    if (ugd->layout_main != NULL) {
-        evas_object_del (ugd->layout_main);
-        ugd->layout_main = NULL;
-    }
-
-    if (_mdl) {
-        delete _mdl;
-        _mdl = NULL;
-    }
-
-    if (!_config.null ()) {
-        _config->flush ();
-        _config.reset ();
-    }
-
-    for (int i = 0; i < ITEM_TOTAL_COUNT; i++) {
-        if (_p_items[i] != NULL) {
-            if (_p_items[i]->text) {
-                free (_p_items[i]->text);
-                _p_items[i]->text = NULL;
-            }
-            if (_p_items[i]->sub_text) {
-                free (_p_items[i]->sub_text);
-                _p_items[i]->sub_text = NULL;
-            }
-            free (_p_items[i]);
-            _p_items[i] = NULL;
-        }
-    }
-
-    if (_prop_change_handler != NULL) {
-        ecore_event_handler_del (_prop_change_handler);
-        _prop_change_handler = NULL;
-    }
-
-    _reload_signal_connection.disconnect ();
-    _helper_agent.close_connection ();
-    if (_read_handler) {
-        ecore_main_fd_handler_del (_read_handler);
-        _read_handler = 0;
-    }
-}
-
-static void on_message (ui_gadget_h ug, service_h msg, service_h data, void *priv)
-{
-}
-
-static void on_event (ui_gadget_h ug, enum ug_event event, service_h s, void *priv)
-{
-    switch (event) {
-        case UG_EVENT_LOW_MEMORY:
-            break;
-        case UG_EVENT_LOW_BATTERY:
-            break;
-        case UG_EVENT_LANG_CHANGE:
-            break;
-        case UG_EVENT_ROTATE_PORTRAIT:
-            break;
-        case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
-            break;
-        case UG_EVENT_ROTATE_LANDSCAPE:
-            break;
-        case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
-            break;
-        default:
-            break;
-    }
-}
-
-static void on_key_event (ui_gadget_h ug, enum ug_key_event event, service_h s, void *priv)
-{
-    if (ug == NULL || priv == NULL)
-        return;
-
-    struct ug_data *ugd = (struct ug_data *)priv;
-    Elm_Object_Item *top_it;
-
-    switch (event) {
-        case UG_KEY_EVENT_END:
-            top_it = elm_naviframe_top_item_get (ugd->naviframe);
-            // ISE option maybe multiple layouts
-            if (top_it && (elm_object_item_content_get (top_it) != ugd->opt_eo) && (ugd->key_end_cb == ise_option_view_set_cb))
-                _mdl->key_proceeding (TYPE_KEY_END);
-            else
-                ugd->key_end_cb (priv, NULL);
-
-            break;
-        default:
-            break;
-    }
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-    UG_MODULE_API int UG_MODULE_INIT (struct ug_module_ops *ops)
-    {
-        if (ops == NULL)
-            return -1;
-
-        struct ug_data *ugd = (ug_data*)calloc (1, sizeof (struct ug_data));
-        if (ugd == NULL)
-            return -1;
-
-        _common_ugd  = ugd;
-        ops->create  = on_create;
-        ops->start   = on_start;
-        ops->pause   = on_pause;
-        ops->resume  = on_resume;
-        ops->destroy = on_destroy;
-        ops->message = on_message;
-        ops->event   = on_event;
-        ops->key_event = on_key_event;
-        ops->priv    = ugd;
-        ops->opt     = UG_OPT_INDICATOR_ENABLE;
-
-        return 0;
-    }
-
-    UG_MODULE_API void UG_MODULE_EXIT (struct ug_module_ops *ops)
-    {
-        if (ops == NULL)
-            return;
-
-        struct ug_data *ugd = (struct ug_data *)(ops->priv);
-        if (ugd != NULL)
-            free (ugd);
-    }
-
-    // Reset keyboard setting
-    UG_MODULE_API int setting_plugin_reset (service_h s, void *priv)
-    {
-        const int BUFF_MAX = 1024;
-        char readbuf[BUFF_MAX] = {0,};
-        char *value_str = NULL;
-        char *key = NULL;
-
-        if (vconf_set_bool (VCONFKEY_AUTOCAPITAL_ALLOW_BOOL, true) == -1)
-            return -1;
-        if (vconf_set_bool (VCONFKEY_AUTOPERIOD_ALLOW_BOOL, false) == -1)
-            return -1;
-
-        load_config_module ();
-        isf_load_ise_information (ALL_ISE, _config);
-
-        String uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String (SCIM_COMPOSE_KEY_FACTORY_UUID));
-
-        // Read and parse CSC data
-        ifstream csc_file (CSC_FILEPATH);
-
-        if (csc_file.is_open ()) {
-            while (1) {
-                if (csc_file.getline (readbuf, BUFF_MAX) == NULL)
-                    break;
-
-                char **items = eina_str_split (readbuf, "=", 2);
-                if (!items || !items[0]) continue;
-
-                key = trim_string (items[0]);
-                if (!key) continue;
-
-                if (!strcmp (key, "keyboard_uuid")) {
-                    if (items[1]) {
-                        value_str = trim_string (items[1]);
-                        uuid = String (value_str);
-                        free (value_str);
-                    }
-                }
-                else if (!strcmp (key, "keyboard_lang")) {
-                    if (items[1]) {
-                        value_str = trim_string (items[1]);
-                        vconf_set_str (VCONFKEY_ISF_INPUT_LANGUAGE, value_str);
-                        free (value_str);
-                    }
-                }
-
-                free (key);
-                free (items[0]);
-                free (items);
-            }
-
-            csc_file.close ();
-        }
-
-        TOOLBAR_MODE_T type = (TOOLBAR_MODE_T)scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_TYPE), TOOLBAR_KEYBOARD_MODE);
-        if (ecore_x_window_prop_card32_get (ecore_x_window_root_first_get (), ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &_hw_kbd_num, 1) > 0) {
-            if (_hw_kbd_num != 0) {
-                if (type != TOOLBAR_KEYBOARD_MODE) {
-                    _config->write (String (SCIM_CONFIG_DEFAULT_HELPER_ISE), uuid);
-                    _config->flush ();
-                    uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
-                }
-            }
-        }
-
-        isf_control_set_active_ise_by_uuid (uuid.c_str ());
-
-        String mdl_name;
-        for (unsigned int i = 0; i < _module_names.size (); i++) {
-            if (_modes[i] == TOOLBAR_KEYBOARD_MODE)
-                mdl_name = _module_names[i] + String ("-imengine-setup");
-            else
-                mdl_name = _module_names[i] + String ("-setup");
-
-            SetupModule *setup_module = new SetupModule (mdl_name);
-            if (setup_module != NULL && setup_module->valid ()) {
-                if (setup_module->option_reset (_config) == false)
-                    std::cerr << mdl_name << " failed to reset option!\n";
-            } else {
-                std::cerr << "Load " << mdl_name << " is failed!!!\n";
-            }
-
-            if (setup_module) {
-                delete setup_module;
-                setup_module = NULL;
-            }
-        }
-
-        helper_ise_reload_config ();
-
-        return 0;
-    }
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
-vi:ts=4:ai:nowrap:expandtab
- */
diff --git a/ism/m4/ChangeLog b/ism/m4/ChangeLog
deleted file mode 100755 (executable)
index fa2c827..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-2005-03-07  gettextize  <bug-gnu-gettext@gnu.org>
-
-       * gettext.m4: Upgrade to gettext-0.14.1.
-       * intmax.m4: New file, from gettext-0.14.1.
-       * inttypes_h.m4: Upgrade to gettext-0.14.1.
-       * lib-ld.m4: Upgrade to gettext-0.14.1.
-       * lib-link.m4: Upgrade to gettext-0.14.1.
-       * lib-prefix.m4: Upgrade to gettext-0.14.1.
-       * longdouble.m4: New file, from gettext-0.14.1.
-       * longlong.m4: New file, from gettext-0.14.1.
-       * nls.m4: New file, from gettext-0.14.1.
-       * po.m4: New file, from gettext-0.14.1.
-       * printf-posix.m4: New file, from gettext-0.14.1.
-       * progtest.m4: Upgrade to gettext-0.14.1.
-       * signed.m4: New file, from gettext-0.14.1.
-       * size_max.m4: New file, from gettext-0.14.1.
-       * stdint_h.m4: Upgrade to gettext-0.14.1.
-       * uintmax_t.m4: Upgrade to gettext-0.14.1.
-       * ulonglong.m4: Upgrade to gettext-0.14.1.
-       * wchar_t.m4: New file, from gettext-0.14.1.
-       * wint_t.m4: New file, from gettext-0.14.1.
-       * xsize.m4: New file, from gettext-0.14.1.
-       * Makefile.am (EXTRA_DIST): Add the new files.
-
-2004-04-13  gettextize  <bug-gnu-gettext@gnu.org>
-
-       * codeset.m4: New file, from gettext-0.11.5.
-       * gettext.m4: New file, from gettext-0.11.5.
-       * glibc21.m4: New file, from gettext-0.11.5.
-       * iconv.m4: New file, from gettext-0.11.5.
-       * intdiv0.m4: New file, from gettext-0.11.5.
-       * inttypes.m4: New file, from gettext-0.11.5.
-       * inttypes_h.m4: New file, from gettext-0.11.5.
-       * inttypes-pri.m4: New file, from gettext-0.11.5.
-       * isc-posix.m4: New file, from gettext-0.11.5.
-       * lcmessage.m4: New file, from gettext-0.11.5.
-       * lib-ld.m4: New file, from gettext-0.11.5.
-       * lib-link.m4: New file, from gettext-0.11.5.
-       * lib-prefix.m4: New file, from gettext-0.11.5.
-       * progtest.m4: New file, from gettext-0.11.5.
-       * stdint_h.m4: New file, from gettext-0.11.5.
-       * uintmax_t.m4: New file, from gettext-0.11.5.
-       * ulonglong.m4: New file, from gettext-0.11.5.
-       * Makefile.am: New file.
-
diff --git a/ism/m4/Makefile.am b/ism/m4/Makefile.am
deleted file mode 100644 (file)
index 8e5299a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES   = Makefile.in
-EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 intltool.m4
diff --git a/ism/m4/codeset.m4 b/ism/m4/codeset.m4
deleted file mode 100755 (executable)
index 59535eb..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
diff --git a/ism/m4/gettext.m4 b/ism/m4/gettext.m4
deleted file mode 100755 (executable)
index a374f03..0000000
+++ /dev/null
@@ -1,487 +0,0 @@
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Set USE_NLS.
-  AM_NLS
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
-[
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/ism/m4/glibc21.m4 b/ism/m4/glibc21.m4
deleted file mode 100755 (executable)
index 9c9f3db..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-       [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-       ],
-       ac_cv_gnu_library_2_1=yes,
-       ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
diff --git a/ism/m4/iconv.m4 b/ism/m4/iconv.m4
deleted file mode 100755 (executable)
index c5f3579..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
diff --git a/ism/m4/intdiv0.m4 b/ism/m4/intdiv0.m4
deleted file mode 100755 (executable)
index 55dddcf..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])
diff --git a/ism/m4/intltool.m4 b/ism/m4/intltool.m4
deleted file mode 100755 (executable)
index 4297ba9..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-##         Kenneth Christiansen <kenneth@gnu.org>
-##
-## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 2 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[
-
-if test -n "$1"; then
-    AC_MSG_CHECKING(for intltool >= $1)
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }'  < ${ac_aux_dir}/intltool-update.in`
-    changequote({{,}})
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-    changequote([,])
-
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-       AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    else
-       AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool $1 or later.])
-       exit 1
-    fi
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-
-# Use the tools built into the package, not the ones that are installed.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found; required for intltool])
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-   AC_MSG_ERROR([perl 5.x required for intltool])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
-# Remove file type tags (using []) from po/POTFILES.
-
-ifdef([AC_DIVERSION_ICMDS],[
-  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-      changequote(,)
-      mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-      rm -f po/POTFILES.tmp
-      changequote([,])
-  AC_DIVERT_POP()
-],[
-  ifdef([AC_CONFIG_COMMANDS_PRE],[
-    AC_CONFIG_COMMANDS_PRE([
-        changequote(,)
-        mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-        changequote([,])
-    ])
-  ])
-
-############################################################################
-## Take this bit from AM_PROG_MKDIR_P to set mkdir_p for automake 1.4 users
-############################################################################
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])
-])
-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-               -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-               -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-               -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-               -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-               -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
-
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}')
-
-])
-
-# deprecated macros
-AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
-
diff --git a/ism/m4/intmax.m4 b/ism/m4/intmax.m4
deleted file mode 100755 (executable)
index dfb08cc..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
-    [AC_TRY_COMPILE([
-#include <stddef.h> 
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE(HAVE_INTMAX_T, 1,
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/ism/m4/inttypes-pri.m4 b/ism/m4/inttypes-pri.m4
deleted file mode 100755 (executable)
index fd007c3..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
-])
diff --git a/ism/m4/inttypes.m4 b/ism/m4/inttypes.m4
deleted file mode 100755 (executable)
index ab370ff..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
diff --git a/ism/m4/inttypes_h.m4 b/ism/m4/inttypes_h.m4
deleted file mode 100755 (executable)
index f342eba..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/ism/m4/isc-posix.m4 b/ism/m4/isc-posix.m4
deleted file mode 100755 (executable)
index 1319dd1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
diff --git a/ism/m4/lcmessage.m4 b/ism/m4/lcmessage.m4
deleted file mode 100755 (executable)
index ffd4008..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
diff --git a/ism/m4/lib-ld.m4 b/ism/m4/lib-ld.m4
deleted file mode 100755 (executable)
index 38aeaec..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break ;;
-      *)
-       test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
diff --git a/ism/m4/lib-link.m4 b/ism/m4/lib-link.m4
deleted file mode 100755 (executable)
index eeb200d..0000000
+++ /dev/null
@@ -1,551 +0,0 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
diff --git a/ism/m4/lib-prefix.m4 b/ism/m4/lib-prefix.m4
deleted file mode 100755 (executable)
index 8aff5a9..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
diff --git a/ism/m4/longdouble.m4 b/ism/m4/longdouble.m4
deleted file mode 100755 (executable)
index 1333d2f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the compiler supports the 'long double' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_LONGDOUBLE],
-[
-  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
-    [if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       AC_TRY_COMPILE([
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-         ], ,
-         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
-     fi])
-  if test $gt_cv_c_long_double = yes; then
-    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
-  fi
-])
diff --git a/ism/m4/longlong.m4 b/ism/m4/longlong.m4
deleted file mode 100755 (executable)
index d7d7350..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# longlong.m4 serial 4
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG if 'long long' works.
-
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
-[
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
-  if test $ac_cv_type_long_long = yes; then
-    AC_DEFINE(HAVE_LONG_LONG, 1,
-      [Define if you have the 'long long' type.])
-  fi
-])
diff --git a/ism/m4/nls.m4 b/ism/m4/nls.m4
deleted file mode 100755 (executable)
index 36bc493..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/ism/m4/po.m4 b/ism/m4/po.m4
deleted file mode 100755 (executable)
index e161998..0000000
+++ /dev/null
@@ -1,426 +0,0 @@
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[  ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[     ]*VARIABLE[     ]*=/{
-  # Seen the first line of the variable definition.
-  s/^[  ]*VARIABLE[     ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assigment from automake.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-       @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-       \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-       @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-       \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
diff --git a/ism/m4/printf-posix.m4 b/ism/m4/printf-posix.m4
deleted file mode 100755 (executable)
index 186ba6a..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# printf-posix.m4 serial 2 (gettext-0.13.1)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-    gt_cv_func_printf_posix,
-    [
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
-      [
-        AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-        ], gt_cv_func_printf_posix="guessing no",
-           gt_cv_func_printf_posix="guessing yes")
-      ])
-    ])
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-        [Define if your printf() function supports format strings with positions.])
-      ;;
-  esac
-])
diff --git a/ism/m4/progtest.m4 b/ism/m4/progtest.m4
deleted file mode 100755 (executable)
index 8fe527c..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
diff --git a/ism/m4/signed.m4 b/ism/m4/signed.m4
deleted file mode 100755 (executable)
index dc1f54f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([bh_C_SIGNED],
-[
-  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
-   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
-  if test $bh_cv_c_signed = no; then
-    AC_DEFINE(signed, ,
-              [Define to empty if the C compiler doesn't support this keyword.])
-  fi
-])
diff --git a/ism/m4/size_max.m4 b/ism/m4/size_max.m4
deleted file mode 100755 (executable)
index 5762fc3..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
-  AC_CHECK_HEADERS(stdint.h)
-  dnl First test whether the system already has SIZE_MAX.
-  AC_MSG_CHECKING([for SIZE_MAX])
-  result=
-  AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], result=yes)
-  if test -z "$result"; then
-    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-    dnl than the type 'unsigned long'.
-    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
-    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
-    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-      [#include <stddef.h>], result=?)
-    if test "$fits_in_uint" = 1; then
-      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-      AC_TRY_COMPILE([#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-        ], [], fits_in_uint=0)
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
-      else
-        result="$res_hi$res_lo"UL
-      fi
-    else
-      dnl Shouldn't happen, but who knows...
-      result='~(size_t)0'
-    fi
-  fi
-  AC_MSG_RESULT([$result])
-  if test "$result" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
-      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-  fi
-])
diff --git a/ism/m4/stdint_h.m4 b/ism/m4/stdint_h.m4
deleted file mode 100755 (executable)
index 32ba7ae..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/ism/m4/uintmax_t.m4 b/ism/m4/uintmax_t.m4
deleted file mode 100755 (executable)
index b5f28d4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE(HAVE_UINTMAX_T, 1,
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/ism/m4/ulonglong.m4 b/ism/m4/ulonglong.m4
deleted file mode 100755 (executable)
index 1da8b80..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# ulonglong.m4 serial 3
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the 'unsigned long long' type.])
-  fi
-])
diff --git a/ism/m4/wchar_t.m4 b/ism/m4/wchar_t.m4
deleted file mode 100755 (executable)
index d8fd1ec..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# wchar_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WCHAR_T],
-[
-  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
-    [AC_TRY_COMPILE([#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
-  fi
-])
diff --git a/ism/m4/wint_t.m4 b/ism/m4/wint_t.m4
deleted file mode 100755 (executable)
index 3d8d215..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# wint_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WINT_T],
-[
-  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
-    [AC_TRY_COMPILE([#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
-  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
-  fi
-])
diff --git a/ism/m4/xsize.m4 b/ism/m4/xsize.m4
deleted file mode 100755 (executable)
index 9b7cf9b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# xsize.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-AC_DEFUN([gl_XSIZE],
-[
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_CHECK_HEADERS(stdint.h)
-])
index 73675be..a21172d 100644 (file)
@@ -632,7 +632,8 @@ SocketConfig::open_connection () const
 
     // Connect to SocketFrontEnd.
     if (!m_socket_client.connect (socket_address)) {
-        for (int i = 0; i < 6; ++i) {
+        /* Retry connecting atmost 10 seconds */
+        for (int i = 0; i < 100; ++i) {
             if (m_socket_client.connect (socket_address))
                 break;
             scim_usleep (100000);
index 203f831..f2a5082 100755 (executable)
@@ -714,6 +714,9 @@ static void ReturnSelectionNotify (Xi18n i18n_core, XSelectionRequestEvent *ev)
     {
         snprintf (buf, 4096, "@transport=%s", i18n_core->address.im_addr);
     }
+    else
+        return;
+
     /*endif*/
     XChangeProperty (dpy,
                      event.xselection.requestor,
index 4e5a1b4..88842c0 100644 (file)
@@ -192,7 +192,7 @@ void SocketFrontEnd::load_helper_modules (const std::vector<String> &load_engine
         String filename = String (USER_ENGINE_FILE_NAME);
         FILE *engine_list_file = fopen (filename.c_str (), "a");
         if (!engine_list_file) {
-            LOGD ("Failed to open %s!!!\n", filename.c_str ());
+            LOGW ("Failed to open %s!!!\n", filename.c_str ());
         }
 
         for (size_t i = 0; i < mod_list.size (); ++i) {
@@ -220,7 +220,7 @@ void SocketFrontEnd::load_helper_modules (const std::vector<String> &load_engine
                             String line = isf_combine_ise_info_string (info.name, info.uuid, mod_list [i], isf_get_normalized_language (module.get_helper_lang (j)),
                                                                        info.icon, String (mode), String (option), String (""));
                             if (fputs (line.c_str (), engine_list_file) < 0)
-                                LOGD ("Failed to write (%s)!!!\n", line.c_str ());
+                                LOGW ("Failed to write (%s)!!!\n", line.c_str ());
                         }
                     }
                 }
@@ -231,7 +231,7 @@ void SocketFrontEnd::load_helper_modules (const std::vector<String> &load_engine
         if (engine_list_file) {
             int ret = fclose (engine_list_file);
             if (ret != 0)
-                LOGD ("Failed to fclose %s!!!\n", filename.c_str ());
+                LOGW ("Failed to fclose %s!!!\n", filename.c_str ());
         }
     }
 }
@@ -629,6 +629,96 @@ SocketFrontEnd::delete_surrounding_text (int id, int offset, int len)
     return ret;
 }
 
+bool
+SocketFrontEnd::get_selection (int id, WideString &text)
+{
+    bool ret = false;
+    text.clear ();
+
+    if (m_current_instance == id && m_current_socket_client >= 0) {
+        bool cont = false;
+        Socket socket_client (m_current_socket_client);
+        if ( m_send_trans.get_data_type () != SCIM_TRANS_DATA_UNKNOWN) {
+            m_send_trans.put_command (ISM_TRANS_CMD_TRANSACTION_CONTINUE);
+            m_send_trans.write_to_socket (socket_client);
+            cont = true;
+        }
+
+        m_temp_trans.clear ();
+        m_temp_trans.put_command (SCIM_TRANS_CMD_REPLY);
+        m_temp_trans.put_command (SCIM_TRANS_CMD_GET_SELECTION);
+
+        if (m_temp_trans.write_to_socket (socket_client) &&
+            m_temp_trans.read_from_socket (socket_client, m_socket_timeout)) {
+
+            int cmd;
+            uint32 key;
+
+            if (m_temp_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST &&
+                m_temp_trans.get_data (key) && key == m_current_socket_client_key &&
+                m_temp_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_GET_SELECTION &&
+                m_temp_trans.get_data (text)) {
+                ret = true;
+            }
+        }
+        if (cont) {
+            int cmd;
+            m_send_trans.clear ();
+            m_send_trans.put_command (SCIM_TRANS_CMD_REPLY);
+
+            // Move the read ptr to the end.
+            if (!m_send_trans.get_command (cmd))
+                SCIM_DEBUG_FRONTEND (1) << __func__ << " Get command is failed!!!\n";
+        }
+    }
+    return ret;
+
+}
+
+bool
+SocketFrontEnd::set_selection (int id, int start, int end)
+{
+    bool ret = false;
+    if (m_current_instance == id && m_current_socket_client >= 0) {
+        bool cont = false;
+
+        Socket socket_client (m_current_socket_client);
+        if (m_send_trans.get_data_type () != SCIM_TRANS_DATA_UNKNOWN) {
+            m_send_trans.put_command (ISM_TRANS_CMD_TRANSACTION_CONTINUE);
+            m_send_trans.write_to_socket (socket_client);
+            cont = true;
+        }
+        m_temp_trans.clear ();
+        m_temp_trans.put_command (SCIM_TRANS_CMD_REPLY);
+        m_temp_trans.put_command (SCIM_TRANS_CMD_SET_SELECTION);
+        m_temp_trans.put_data ((uint32) start);
+        m_temp_trans.put_data ((uint32) end);
+
+        if (m_temp_trans.write_to_socket (socket_client) &&
+            m_temp_trans.read_from_socket (socket_client, m_socket_timeout)) {
+
+            int cmd;
+            uint32 key;
+
+            if (m_temp_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REQUEST &&
+                m_temp_trans.get_data (key) && key == m_current_socket_client_key &&
+                m_temp_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_SET_SELECTION &&
+                m_temp_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK)
+                ret = true;
+        }
+        if (cont) {
+            int cmd;
+            m_send_trans.clear ();
+            m_send_trans.put_command (SCIM_TRANS_CMD_REPLY);
+
+            // Move the read ptr to the end.
+            if (!m_send_trans.get_command (cmd))
+                SCIM_DEBUG_FRONTEND (1) << __func__ << " Get command is failed!!!\n";
+        }
+    }
+    return ret;
+}
+
 void
 SocketFrontEnd::expand_candidate (int id)
 {
index eaa93a3..41dcf36 100644 (file)
@@ -135,6 +135,9 @@ protected:
     virtual bool get_surrounding_text    (int id, WideString &text, int &cursor, int maxlen_before, int maxlen_after);
     virtual bool delete_surrounding_text (int id, int offset, int len);
 
+    virtual bool get_selection           (int id, WideString &text);
+    virtual bool set_selection           (int id, int start, int end);
+
     virtual void expand_candidate        (int id);
     virtual void contract_candidate      (int id);
     virtual void set_candidate_style     (int                           id,
index cb39fe0..338b566 100644 (file)
@@ -406,6 +406,32 @@ X11FrontEnd::delete_surrounding_text (int siid, int offset, int len)
     return false;
 }
 
+bool
+X11FrontEnd::get_selection (int siid, WideString &text)
+{
+    SCIM_DEBUG_FRONTEND(2) << " Get selection, siid=" << siid << "\n";
+
+    text.clear ();
+
+    if (is_inputing_ic (siid)) {
+        return false;
+    }
+
+    return false;
+}
+
+bool
+X11FrontEnd::set_selection (int siid, int start, int end)
+{
+    SCIM_DEBUG_FRONTEND(2) << " set selection, siid=" << siid << " start = " << start << " end = " << end << "\n";
+
+    if (is_inputing_ic (siid)) {
+        return false;
+    }
+
+    return false;
+}
+
 void
 X11FrontEnd::init (int argc, char **argv)
 {
@@ -599,9 +625,8 @@ X11FrontEnd::init_ims (void)
     // Initialize X Display and Root Windows.
     if (m_xims != (XIMS) 0) {
         throw FrontEndError (String ("X11 -- XIMS already initialized!"));
-       }
+    }
 
-    int retry = 0;
     m_display = XOpenDisplay (NULL);
 
     /* Let's try several more times until X server gets available... */
index 9bb0d4d..9e56cba 100644 (file)
@@ -121,6 +121,9 @@ protected:
     virtual bool get_surrounding_text    (int siid, WideString &text, int &cursor, int maxlen_before, int maxlen_after);
     virtual bool delete_surrounding_text (int siid, int offset, int len);
 
+    virtual bool get_selection           (int siid, WideString &text);
+    virtual bool set_selection           (int siid, int start, int end);
+
 public:
     virtual void init (int argc, char **argv);
     virtual void run ();
index 792c13b..4997155 100644 (file)
@@ -1206,6 +1206,43 @@ SocketInstance::do_transaction (Transaction &trans, bool &ret)
                     cont = true;
                     break;
                 }
+                case SCIM_TRANS_CMD_GET_SELECTION:
+                {
+                    WideString text;
+                    Transaction temp_trans;
+
+                    global->init_transaction (temp_trans);
+                    if (get_selection (text)) {
+                        temp_trans.put_command (SCIM_TRANS_CMD_GET_SELECTION);
+                        temp_trans.put_data (text);
+                    } else {
+                        temp_trans.put_command (SCIM_TRANS_CMD_FAIL);
+                    }
+                    if (!global->send_transaction (temp_trans))
+                        std::cerr << "GET_SELECTION: global->send_transaction () is failed!!!\n";
+
+                    cont = true;
+                    break;
+                }
+                case SCIM_TRANS_CMD_SET_SELECTION:
+                {
+                    uint32 start;
+                    uint32 end;
+                    Transaction temp_trans;
+                    if (trans.get_data (start) && trans.get_data (end)) {
+                        global->init_transaction (temp_trans);
+                        if (set_selection ((int) start, (int) end)) {
+                            temp_trans.put_command (SCIM_TRANS_CMD_SET_SELECTION);
+                            temp_trans.put_command (SCIM_TRANS_CMD_OK);
+                        } else {
+                            temp_trans.put_command (SCIM_TRANS_CMD_FAIL);
+                        }
+                        if (!global->send_transaction (temp_trans))
+                            std::cerr << "SET_SELECTION: global->send_transaction () is failed!!!\n";
+                    }
+                    cont = true;
+                    break;
+                }
                 case ISM_TRANS_CMD_EXPAND_CANDIDATE:
                 {
                     SCIM_DEBUG_IMENGINE(3) << "  expand_candidate ()\n";
index c15ccd7..6b56699 100644 (file)
@@ -87,6 +87,7 @@ libsciminclude_HEADERS        = scim.h \
                          scim_transaction.h \
                          scim_types.h \
                          scim_utility.h \
+                         scim_setup_module_efl.h \
                          isf_control.h \
                          isf_imcontrol_client.h \
                          ise_context.h \
@@ -135,11 +136,12 @@ libscim@SCIM_EPOCH@_la_SOURCES = scim_backend.cpp \
                          scim_socket.cpp \
                          scim_transaction.cpp \
                          scim_utility.cpp \
+                         scim_setup_module_efl.cpp \
                          isf_control.cpp \
                          isf_imcontrol_client.cpp \
                          isf_query_utility.cpp
 
-libscim@SCIM_EPOCH@_la_CXXFLAGS = @GTK2_CFLAGS@ @DLOG_CFLAGS@
+libscim@SCIM_EPOCH@_la_CXXFLAGS = @EFL_CFLAGS@ @DLOG_CFLAGS@ @SECURITY_SERVER_CFLAGS@
 
 libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
                          -export-dynamic \
@@ -149,8 +151,10 @@ libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION)
                          @LIBTOOL_EXPORT_OPTIONS@ \
                          @LIBICONV@ \
                          @LTLIBINTL@ \
+                         @SECURITY_SERVER_LIBS@ \
+                         @EFL_LIBS@ \
                          -lstdc++ \
-                         -ltzplatform-config-1.0
+              -ltzplatform-config-1.0
 
 libscim@SCIM_EPOCH@_la_LIBADD  = libltdlc.la
 
@@ -158,8 +162,9 @@ libscim@SCIM_EPOCH@_la_LIBADD       = libltdlc.la
 bin_PROGRAMS           = scim isf-log isf-query-engines
 
 scim_SOURCES           = scim.cpp
+scim_CXXFLAGS          = @EFL_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@ @VCONF_CFLAGS@
 scim_LDADD             = libscim@SCIM_EPOCH@.la
-scim_LDFLAGS           = @LTLIBINTL@
+scim_LDFLAGS           = @LTLIBINTL@ @EFL_LIBS@ @PRIVILEGE_CONTROL_LIBS@ @VCONF_LIBS@
 
 isf_log_SOURCES                = isf_log.cpp
 isf_log_LDADD          = libscim@SCIM_EPOCH@.la
@@ -171,22 +176,22 @@ isf_log_LDFLAGS           = @LTLIBINTL@ -rpath $(libdir) -lglib-2.0 -lgobject-2.0
 endif
 
 isf_query_engines_SOURCES  = isf_query_engines.cpp
-isf_query_engines_CXXFLAGS = @VCONF_CFLAGS@
+isf_query_engines_CXXFLAGS = @VCONF_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@
 isf_query_engines_LDADD    = libscim@SCIM_EPOCH@.la
-isf_query_engines_LDFLAGS  = @LTLIBINTL@ @VCONF_LIBS@
+isf_query_engines_LDFLAGS  = @LTLIBINTL@ @VCONF_LIBS@ @PRIVILEGE_CONTROL_LIBS@
 
 libexecdir             = $(libdir)/scim@SCIM_EPOCH@
 libexec_PROGRAMS        = scim-launcher scim-helper-launcher
 
 scim_launcher_SOURCES  = scim_launcher.cpp
 scim_launcher_LDADD    = libscim@SCIM_EPOCH@.la
-scim_launcher_CXXFLAGS  = @VCONF_CFLAGS@
-scim_launcher_LDFLAGS  = @LTLIBINTL@ @VCONF_LIBS@
+scim_launcher_CXXFLAGS  = @PRIVILEGE_CONTROL_CFLAGS@ @VCONF_CFLAGS@
+scim_launcher_LDFLAGS  = @LTLIBINTL@ @PRIVILEGE_CONTROL_LIBS@ @VCONF_LIBS@
 
 scim_helper_launcher_SOURCES   = scim_helper_launcher.cpp ise_preexec.cpp
-scim_helper_launcher_CXXFLAGS  = @PRIVILEGE_CONTROL_CFLAGS@ @AIL_CFLAGS@
+scim_helper_launcher_CXXFLAGS  = @PRIVILEGE_CONTROL_CFLAGS@ @AIL_CFLAGS@ @EFL_CFLAGS@
 scim_helper_launcher_LDADD     = libscim@SCIM_EPOCH@.la
-scim_helper_launcher_LDFLAGS   = @LTLIBINTL@ @PRIVILEGE_CONTROL_LIBS@ @AIL_LIBS@
+scim_helper_launcher_LDFLAGS   = @LTLIBINTL@ @PRIVILEGE_CONTROL_LIBS@ @AIL_LIBS@ @EFL_LIBS@
 
 
 
index 7e7ed96..50323a6 100644 (file)
@@ -30,9 +30,9 @@
 #include <string.h>
 #include <sys/xattr.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <sys/prctl.h>
-
+#include <unistd.h>
+#include <dlog.h>
 #include <ail.h>
 #include <privilege-control.h>
 
 #define _E(fmt, arg...) printf("[%s,%d] "fmt, __FUNCTION__, __LINE__, ##arg)
 #define _D(fmt, arg...) printf("[%s,%d] "fmt, __FUNCTION__, __LINE__, ##arg)
 
+#ifdef LOG_TAG
+# undef LOG_TAG
+#endif
+#define LOG_TAG "ISE_PREEXEC"
+
+/* The broker for launching OSP based IMEs */
+// {
+
+#include <pwd.h>
+#include <Ecore.h>
+#include <Ecore_Ipc.h>
+
+Ecore_Ipc_Server *server = NULL;
+
+Eina_Bool sig_exit_cb (void *data, int ev_type, void *ev)
+{
+    ecore_main_loop_quit ();
+    return ECORE_CALLBACK_CANCEL;
+}
+
+Eina_Bool handler_server_data (void *data, int ev_type, void *ev) {
+    Ecore_Ipc_Event_Server_Data *e = (Ecore_Ipc_Event_Server_Data *)ev;
+    if (e) {
+        char message[_POSIX_PATH_MAX] = {0};
+        strncpy (message, (char*)(e->data), e->size);
+        LOGD ("Got server data %p [%i] [%i] [%i] (%s)\n", e->server, e->major, e->minor, e->size, message);
+        ecore_main_loop_quit ();
+    }
+    return ECORE_CALLBACK_RENEW;
+}
+
+void send_message_to_broker (const char *message)
+{
+    LOGD ("send_message_to_broker () starting\n");
+
+    if (!ecore_init ()) {
+        LOGW ("unable to init ecore\n");
+        return;
+    }
+
+    if (!ecore_ipc_init ()) {
+        LOGW ("failed to init ecore_ipc\n");
+        return;
+    }
+
+    Ecore_Event_Handler *exit_handler = NULL;
+    Ecore_Event_Handler *data_handler = NULL;
+
+    exit_handler = ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, sig_exit_cb, NULL);
+    data_handler = ecore_event_handler_add (ECORE_IPC_EVENT_SERVER_DATA, handler_server_data, NULL);
+
+    server = ecore_ipc_server_connect (ECORE_IPC_LOCAL_SYSTEM, "scim-helper-broker", 0, NULL);
+
+    LOGD("connect_broker () : %p\n", server);
+
+    if (server && message) {
+        ecore_ipc_server_send (server, 0, 0, 0, 0, 0, message, strlen (message));
+
+        LOGD ("send message : %s\n", message);
+
+        /* We need a ecore loop for sending the ipc message */
+        ecore_main_loop_begin ();
+
+        if (exit_handler) ecore_event_handler_del (exit_handler);
+        if (data_handler) ecore_event_handler_del (data_handler);
+
+        ecore_ipc_server_del (server);
+        ecore_ipc_shutdown ();
+        ecore_shutdown ();
+    }
+}
+
+// }
+
 namespace scim
 {
 
@@ -60,34 +134,36 @@ static int preexec_initialized = 0;
 typedef struct _preexec_list_t {
     char *pkg_type;
     char *so_path;
+    void *handle;
     int (*dl_do_pre_exe) (char *, char *);
 } preexec_list_t;
 
 static std::list<preexec_list_t*> preexec_list;
 
-static void __preexec_list_free()
+static void __preexec_list_free ()
 {
     preexec_list_t *type_t;
 
-    for(std::list<preexec_list_t*>::iterator iter = preexec_list.begin();
-        iter != preexec_list.end();std::advance(iter, 1)) {
+    for (std::list<preexec_list_t*>::iterator iter = preexec_list.begin ();
+        iter != preexec_list.end ();std::advance (iter, 1)) {
         type_t = *iter;
         if (type_t) {
+            if (type_t->handle)
+                dlclose (type_t->handle);
             if (type_t->pkg_type)
-                free(type_t->pkg_type);
+                free (type_t->pkg_type);
             if (type_t->so_path)
-                free(type_t->so_path);
-            free(type_t);
+                free (type_t->so_path);
+            free (type_t);
         }
     }
-    preexec_list.clear();
-
+    preexec_list.clear ();
+    preexec_initialized = 0;
     return;
 }
 
-static inline void __preexec_init()
+static inline void __preexec_init ()
 {
-    void *handle = NULL;
     FILE *preexec_file;
     char *saveptr = NULL;
     char line[MAX_LOCAL_BUFSZ];
@@ -97,7 +173,7 @@ static inline void __preexec_init()
     int (*func) (char *, char *) = NULL;
     preexec_list_t *type_t = NULL;
 
-    preexec_file = fopen(PREEXEC_FILE, "rt");
+    preexec_file = fopen (PREEXEC_FILE, "rt");
     if (preexec_file == NULL) {
         _E("no preexec\n");
         return;
@@ -105,85 +181,90 @@ static inline void __preexec_init()
 
     _D("preexec start\n");
 
-    while (fgets(line, MAX_LOCAL_BUFSZ, preexec_file) > 0) {
+    while (fgets (line, MAX_LOCAL_BUFSZ, preexec_file) > 0) {
         /* Parse each line */
         if (line[0] == '#' || line[0] == '\0')
             continue;
 
-        type = strtok_r(line, ":\f\n\r\t\v ", &saveptr);
+        type = strtok_r (line, ":\f\n\r\t\v ", &saveptr);
         if (type == NULL)
             continue;
-        sopath = strtok_r(NULL, ",\f\n\r\t\v ", &saveptr);
+        sopath = strtok_r (NULL, ",\f\n\r\t\v ", &saveptr);
         if (sopath == NULL)
             continue;
-        symbol = strtok_r(NULL, ",\f\n\r\t\v ", &saveptr);
+        symbol = strtok_r (NULL, ",\f\n\r\t\v ", &saveptr);
         if (symbol == NULL)
             continue;
 
-        type_t = (preexec_list_t *) calloc(1, sizeof(preexec_list_t));
+        type_t = (preexec_list_t *) calloc (1, sizeof (preexec_list_t));
         if (type_t == NULL) {
             _E("no available memory\n");
-            __preexec_list_free();
+            __preexec_list_free ();
+            fclose (preexec_file);
             return;
         }
 
-        handle = dlopen(sopath, RTLD_NOW);
-        if (handle == NULL) {
-            free(type_t);
+        type_t->handle = dlopen (sopath, RTLD_NOW);
+        if (type_t->handle == NULL) {
+            free (type_t);
             continue;
         }
-        _D("preexec %s %s# - handle : %x\n", type, sopath, handle);
+        _D("preexec %s %s# - handle : %x\n", type, sopath, type_t->handle);
 
-        func = (int (*)(char*, char*))dlsym(handle, symbol);
+        func = (int (*)(char*, char*))dlsym (type_t->handle, symbol);
         if (func == NULL) {
             _E("failed to get symbol type:%s path:%s\n",
                type, sopath);
-            free(type_t);
-            dlclose(handle);
+            dlclose (type_t->handle);
+            free (type_t);
             continue;
         }
 
-        type_t->pkg_type = strdup(type);
+        type_t->pkg_type = strdup (type);
         if (type_t->pkg_type == NULL) {
             _E("no available memory\n");
-            free(type_t);
-            __preexec_list_free();
+            dlclose (type_t->handle);
+            free (type_t);
+            __preexec_list_free ();
+            fclose (preexec_file);
             return;
         }
-        type_t->so_path = strdup(sopath);
+        type_t->so_path = strdup (sopath);
         if (type_t->so_path == NULL) {
             _E("no available memory\n");
-            free(type_t->pkg_type);
-            free(type_t);
-            __preexec_list_free();
+            dlclose (type_t->handle);
+            free (type_t->pkg_type);
+            free (type_t);
+            __preexec_list_free ();
+            fclose (preexec_file);
             return;
         }
         type_t->dl_do_pre_exe = func;
 
-        preexec_list.insert(preexec_list.end(), type_t);
+        preexec_list.insert (preexec_list.end (), type_t);
     }
 
-    fclose(preexec_file);
+    fclose (preexec_file);
     preexec_initialized = 1;
 }
 
-static inline void __preexec_run(const char *pkg_type, const char *pkg_name,
-                                 const char *app_path)
+static inline void __preexec_run (const char *pkg_type, const char *pkg_name,
+                                  const char *app_path)
 {
     preexec_list_t *type_t;
 
     if (!preexec_initialized)
         return;
 
-    for(std::list<preexec_list_t*>::iterator iter = preexec_list.begin();
-        iter != preexec_list.end();std::advance(iter, 1)) {
+    for (std::list<preexec_list_t*>::iterator iter = preexec_list.begin ();
+        iter != preexec_list.end ();std::advance (iter, 1)) {
         type_t = *iter;
         if (type_t) {
-            if (!strcmp(pkg_type, type_t->pkg_type)) {
+            if (!strcmp (pkg_type, type_t->pkg_type)) {
                 if (type_t->dl_do_pre_exe != NULL) {
-                    type_t->dl_do_pre_exe((char *)pkg_name,
+                    type_t->dl_do_pre_exe ((char *)pkg_name,
                         (char *)app_path);
-                    _D("called dl_do_pre_exe() type: %s, %s %s\n", pkg_type, pkg_name, app_path);
+                    _D("called dl_do_pre_exe () type: %s, %s %s\n", pkg_type, pkg_name, app_path);
                 } else {
                     _E("no symbol for this type: %s",
                         pkg_type);
@@ -191,30 +272,29 @@ static inline void __preexec_run(const char *pkg_type, const char *pkg_name,
             }
         }
     }
-
 }
 
-static void __set_oom()
+static void __set_oom ()
 {
     char buf[MAX_LOCAL_BUFSZ];
     FILE *fp;
 
     /* we should reset oomadj value as default because child
     inherits from parent oom_adj*/
-    snprintf(buf, MAX_LOCAL_BUFSZ, "/proc/%d/oom_adj", getpid());
-    fp = fopen(buf, "w");
+    snprintf (buf, MAX_LOCAL_BUFSZ, "/proc/%d/oom_adj", getpid ());
+    fp = fopen (buf, "w");
     if (fp == NULL)
         return;
-    fprintf(fp, "%d", -16);
-    fclose(fp);
+    fprintf (fp, "%d", -16);
+    fclose (fp);
 }
 
-static inline int __set_dac()
+static inline int __set_dac ()
 {
     return perm_app_set_privilege("isf", NULL, NULL);
 }
 
-static inline int __set_smack(char* path)
+static inline int __set_smack (char* path)
 {
     /*
      * This is additional option.
@@ -224,21 +304,21 @@ static inline int __set_smack(char* path)
     int fd = 0;
     int result = -1;
 
-    result = getxattr(path, "security.SMACK64EXEC", label, LABEL_LEN);
-    if(result < 0)  // fail to get extended attribute
+    result = getxattr (path, "security.SMACK64EXEC", label, LABEL_LEN);
+    if (result < 0)  // fail to get extended attribute
         return 0;   // ignore error
 
-    fd = open("/proc/self/attr/current", O_RDWR);
-    if(fd < 0)      // fail to open file
+    fd = open ("/proc/self/attr/current", O_RDWR);
+    if (fd < 0)      // fail to open file
         return 0;   // ignore error
 
-    result = write(fd, label, strlen(label));
-    if(result < 0) {    // fail to write label
-        close(fd);
+    result = write (fd, label, strlen (label));
+    if (result < 0) {    // fail to write label
+        close (fd);
         return 0;   // ignore error
     }
 
-    close(fd);
+    close (fd);
     return 0;
 }
 
@@ -248,42 +328,44 @@ typedef struct {
     std::string app_path;
 } PKGINFO;
 
-static void get_pkginfo(const char *helper, PKGINFO *info)
+static void get_pkginfo (const char *helper, PKGINFO *info)
 {
-    if (helper && info ) {
+    if (helper && info) {
         ail_appinfo_h handle;
         ail_error_e r;
         char *value;
-        r = ail_package_get_appinfo(helper, &handle);
+        r = ail_get_appinfo (helper, &handle);
         if (r != AIL_ERROR_OK) {
+            LOGW ("ail_get_appinfo failed %s %d \n", helper, r);
             /* Let's try with appid once more */
-            r = ail_get_appinfo(helper, &handle);
+            r = ail_get_appinfo (helper, &handle);
             if (r != AIL_ERROR_OK) {
+                LOGW ("ail_get_appinfo failed %s %d \n", helper, r);
                 return;
             }
         }
 
         info->package_name = helper;
 
-        r = ail_appinfo_get_str(handle, AIL_PROP_X_SLP_PACKAGETYPE_STR, &value);
+        r = ail_appinfo_get_str (handle, AIL_PROP_X_SLP_PACKAGETYPE_STR, &value);
         if (r != AIL_ERROR_OK) {
-            printf("ail_appinfo_get_str() failed : %s %s\n", helper, AIL_PROP_X_SLP_PACKAGETYPE_STR);
+            LOGW ("ail_appinfo_get_str () failed : %s %s %d\n", helper, AIL_PROP_X_SLP_PACKAGETYPE_STR, r);
         } else {
             info->package_type = value;
         }
 
-        r = ail_appinfo_get_str(handle, AIL_PROP_EXEC_STR, &value);
+        r = ail_appinfo_get_str (handle, AIL_PROP_EXEC_STR, &value);
         if (r != AIL_ERROR_OK) {
-            printf("ail_appinfo_get_str() failed : %s %s\n", helper, AIL_PROP_EXEC_STR);
+            LOGW ("ail_appinfo_get_str () failed : %s %s %d\n", helper, AIL_PROP_EXEC_STR, r);
         } else {
             info->app_path = value;
         }
 
-        ail_package_destroy_appinfo(handle);
+        ail_destroy_appinfo (handle);
     }
 }
 
-int ise_preexec(const char *helper)
+int ise_preexec (const char *helper, const char *uuid)
 {
     const char *file_name;
     char process_name[AUL_PR_NAME];
@@ -293,44 +375,67 @@ int ise_preexec(const char *helper)
     info.package_type = DEFAULT_PACKAGE_TYPE;
     info.app_path = DEFAULT_APPLICATION_PATH;
 
-    get_pkginfo(helper, &info);
+    LOGD ("starting\n");
+
+    get_pkginfo (helper, &info);
+
+    /* In case of OSP IME, request scim process to re-launch this ISE if we are not ROOT! */
+    struct passwd *lpwd;
+    lpwd = getpwuid (getuid ());
+    if (lpwd && lpwd->pw_name) {
+        if (info.package_type.compare (DEFAULT_PACKAGE_TYPE) != 0) {
+            if (strcmp (lpwd->pw_name, "root") != 0) {
+                LOGD ("%s %s %s, return\n", lpwd->pw_name, helper, info.package_type.c_str ());
+
+                String parameter = String (helper);
+                parameter += " ";
+                parameter += uuid;
+                send_message_to_broker (parameter.c_str ());
+
+                return -1;
+            }
+        }
+
+        LOGD ("%s %s %s %s %s %s\n", lpwd->pw_name, helper, uuid,
+             info.package_name.c_str (), info.package_type.c_str (), info.app_path.c_str ());
+    }
 
     /* Set new session ID & new process group ID*/
     /* In linux, child can set new session ID without check permission */
     /* TODO : should be add to check permission in the kernel*/
-    //setsid();
+    //setsid ();
 
-    __preexec_init();
-    __preexec_run(info.package_type.c_str(), info.package_name.c_str(), info.app_path.c_str());
-    __preexec_list_free();
+    __preexec_init ();
+    __preexec_run (info.package_type.c_str (), info.package_name.c_str (), info.app_path.c_str ());
+    __preexec_list_free ();
 
     /* SET OOM*/
-    __set_oom();
+    __set_oom ();
 
     /* SET SMACK LABEL */
-    __set_smack((char*)(info.app_path.c_str()));
+    __set_smack ((char*)(info.app_path.c_str ()));
 
     /* SET DAC*/
     if (__set_dac() != PC_OPERATION_SUCCESS) {
-        _D("fail to set DAC - check your package's credential\n");
-        return -1;
+       _D("fail to set DAC - check your package's credential\n");
+        return -2;
     }
     /* SET DUMPABLE - for coredump*/
-    prctl(PR_SET_DUMPABLE, 1);
+    prctl (PR_SET_DUMPABLE, 1);
 
     /* SET PROCESS NAME*/
-    if (info.app_path.empty()) {
+    if (info.app_path.empty ()) {
         _D("app_path should not be NULL - check menu db");
-        return -1;
+        return -3;
     }
-    file_name = strrchr(info.app_path.c_str(), '/') + 1;
+    file_name = strrchr (info.app_path.c_str (), '/') + 1;
     if (file_name == NULL) {
         _D("can't locate file name to execute");
-        return -1;
+        return -4;
     }
-    memset(process_name, '\0', AUL_PR_NAME);
-    snprintf(process_name, AUL_PR_NAME, "%s", file_name);
-    prctl(PR_SET_NAME, process_name);
+    memset (process_name, '\0', AUL_PR_NAME);
+    snprintf (process_name, AUL_PR_NAME, "%s", file_name);
+    prctl (PR_SET_NAME, process_name);
 
     return 0;
 }
index e42ac28..b409433 100644 (file)
@@ -29,7 +29,7 @@ namespace scim
 {
     /** Since the keyboard applications in Tizen platform are executed by ISF instead of launchpad,
         we have to go through the same procedure that launchpad does, before loading HelperModule. */
-    int ise_preexec(const char *helper);
+    int ise_preexec (const char *helper, const char *uuid);
 }
 
 #endif /* __ISE_PREEXEC_H */
index e5507a2..a4b5bca 100644 (file)
@@ -81,23 +81,30 @@ EAPI int isf_control_get_ise_list (char ***uuid_list)
 
 EAPI int isf_control_get_ise_info (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option)
 {
+    return isf_control_get_ise_info_and_module_name (uuid, name, language, type, option, NULL);
+}
+
+EAPI int isf_control_get_ise_info_and_module_name (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option, char **module_name)
+{
     if (uuid == NULL || name == NULL || language == NULL)
         return -1;
 
     int nType   = 0;
     int nOption = 0;
-    String strName, strLanguage;
+    String strName, strLanguage, strModuleName;
 
     IMControlClient imcontrol_client;
     imcontrol_client.open_connection ();
     imcontrol_client.prepare ();
-    imcontrol_client.get_ise_info (uuid, strName, strLanguage, nType, nOption);
+    imcontrol_client.get_ise_info (uuid, strName, strLanguage, nType, nOption, strModuleName);
     imcontrol_client.close_connection ();
 
     *name     = strName.length () ? strdup (strName.c_str ()) : strdup ("");
     *language = strLanguage.length () ? strdup (strLanguage.c_str ()) : strdup ("");
     *type     = (ISE_TYPE_T)nType;
     *option   = nOption;
+    if (module_name != NULL)
+        *module_name = strModuleName.length () ? strdup (strModuleName.c_str ()) : strdup ("");
 
     return 0;
 }
@@ -124,6 +131,19 @@ EAPI int isf_control_reset_ise_option (void)
     return 0;
 }
 
+EAPI int isf_control_set_initial_ise_by_uuid (const char *uuid)
+{
+    if (uuid == NULL)
+        return -1;
+
+    IMControlClient imcontrol_client;
+    imcontrol_client.open_connection ();
+    imcontrol_client.prepare ();
+    imcontrol_client.set_initial_ise_by_uuid (uuid);
+    imcontrol_client.close_connection ();
+    return 0;
+}
+
 /*
 vi:ts=4:nowrap:ai:expandtab
 */
index b595952..8a63f74 100644 (file)
@@ -86,6 +86,20 @@ EAPI int isf_control_get_ise_list (char ***uuid_list);
 EAPI int isf_control_get_ise_info (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option);
 
 /**
+ * @brief Get ISE's information according to ISE's UUID.
+ *
+ * @param uuid The ISE's UUID.
+ * @param name     The parameter is used to store ISE's name. Applcation need free *name if it is not used.
+ * @param language The parameter is used to store ISE's language. Applcation need free *language if it is not used.
+ * @param type     The parameter is used to store ISE's type.
+ * @param option   The parameter is used to store ISE's option.
+ * @param module_name The parameter is used to store ISE's module file name.
+ *
+ * @return 0 if successfully, otherwise return -1;
+ */
+EAPI int isf_control_get_ise_info_and_module_name (const char *uuid, char **name, char **language, ISE_TYPE_T *type, int *option, char **module_name);
+
+/**
  * @brief Set active ISE to default ISE.
  *
  * @return 0 if successfully, otherwise return -1;
@@ -99,6 +113,15 @@ EAPI int isf_control_set_active_ise_to_default (void);
  */
 EAPI int isf_control_reset_ise_option (void);
 
+/**
+ * @brief Set initial ISE by UUID.
+ *
+ * @param uuid The initial ISE's UUID.
+ *
+ * @return 0 if successfully, otherwise return -1;
+ */
+EAPI int isf_control_set_initial_ise_by_uuid (const char *uuid);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index af9bca9..fa82fe6 100644 (file)
@@ -56,7 +56,7 @@ public:
 
     int open_connection (void) {
         String config = "";
-        String display = String(getenv ("DISPLAY"));
+        String display = String (getenv ("DISPLAY"));
 
         SocketAddress addr (scim_get_default_panel_socket_address (display));
 
@@ -71,7 +71,10 @@ public:
             ret2 = m_socket_panel2imclient.connect (addr);
             if (!ret) {
                 scim_usleep (100000);
+                /* Do not launch panel process here, let the SocketFrontend to create panel process */
+                /*
                 scim_launch_panel (true, config, display, NULL);
+                */
                 for (int i = 0; i < 200; ++i) {
                     if (m_socket_imclient2panel.connect (addr)) {
                         ret = true;
@@ -143,6 +146,21 @@ public:
         }
     }
 
+    void set_initial_ise_by_uuid (const char* uuid) {
+        int cmd;
+        m_trans.put_command (ISM_TRANS_CMD_SET_INITIAL_ISE_BY_UUID);
+        m_trans.put_data (uuid, strlen(uuid)+1);
+        m_trans.write_to_socket (m_socket_imclient2panel);
+        if (!m_trans.read_from_socket (m_socket_imclient2panel, m_socket_timeout))
+            std::cerr << __func__ << " read_from_socket() may be timeout \n";
+
+        if (m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY &&
+                m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) {
+        } else {
+            std::cerr << __func__ << " get_command() or get_data() may fail!!!\n";
+        }
+    }
+
     void get_active_ise (String &uuid) {
         int    cmd;
         String strTemp;
@@ -195,11 +213,11 @@ public:
         *iselist = buf;
     }
 
-    void get_ise_info (const char* uuid, String &name, String &language, int &type, int &option)
+    void get_ise_info (const char* uuid, String &name, String &language, int &type, int &option, String &module_name)
     {
         int    cmd;
         uint32 tmp_type, tmp_option;
-        String tmp_name, tmp_language;
+        String tmp_name, tmp_language, tmp_module_name;
 
         m_trans.put_command (ISM_TRANS_CMD_GET_ISE_INFORMATION);
         m_trans.put_data (String (uuid));
@@ -210,11 +228,12 @@ public:
         if (m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY &&
                 m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK &&
                 m_trans.get_data (tmp_name) && m_trans.get_data (tmp_language) &&
-                m_trans.get_data (tmp_type) && m_trans.get_data (tmp_option)) {
+                m_trans.get_data (tmp_type) && m_trans.get_data (tmp_option) && m_trans.get_data (tmp_module_name)) {
             name     = tmp_name;
             language = tmp_language;
             type     = tmp_type;
             option   = tmp_option;
+            module_name = tmp_module_name;
         } else {
             std::cerr << __func__ << " get_command() or get_data() may fail!!!\n";
         }
@@ -290,6 +309,11 @@ void IMControlClient::set_active_ise_by_uuid (const char* uuid)
     m_impl->set_active_ise_by_uuid (uuid);
 }
 
+void IMControlClient::set_initial_ise_by_uuid (const char* uuid)
+{
+    m_impl->set_initial_ise_by_uuid (uuid);
+}
+
 void IMControlClient::get_active_ise (String &uuid)
 {
     m_impl->get_active_ise (uuid);
@@ -300,9 +324,9 @@ void IMControlClient::get_ise_list (int* count, char*** iselist)
     m_impl->get_ise_list (count, iselist);
 }
 
-void IMControlClient::get_ise_info (const char* uuid, String &name, String &language, int &type, int &option)
+void IMControlClient::get_ise_info (const char* uuid, String &name, String &language, int &type, int &option, String &module_name)
 {
-    m_impl->get_ise_info (uuid, name, language, type, option);
+    m_impl->get_ise_info (uuid, name, language, type, option, module_name);
 }
 
 void IMControlClient::reset_ise_option (void)
index bf1307f..6a0fd9b 100644 (file)
@@ -53,9 +53,10 @@ public:
     void set_active_ise_by_uuid (const char* uuid);
     void get_active_ise (String &uuid);
     void get_ise_list (int* count, char*** iselist);
-    void get_ise_info (const char* uuid, String &name, String &language, int &type, int &option);
+    void get_ise_info (const char* uuid, String &name, String &language, int &type, int &option, String &module_name);
     void reset_ise_option (void);
     void set_active_ise_to_default (void);
+    void set_initial_ise_by_uuid (const char* uuid);
 };
 
 }
index c0d11c4..0093864 100644 (file)
@@ -59,6 +59,8 @@ int main (int argc, char *argv[])
     int isetype = 0;
     int uninstall = 0;
 
+    set_app_privilege ("isf", NULL, NULL);
+
     int i = 1;
     while (i < argc) {
         if (String ("-t") == String (argv[i]) || String ("--type") == String (argv[i])) {
index afd680e..a9f6c96 100644 (file)
@@ -155,7 +155,7 @@ EAPI bool isf_write_ise_info_list (const char *filename, std::vector<ISEINFO> &i
 
     FILE *engine_list_file = fopen (strTempFile.c_str (), "w+");
     if (engine_list_file == NULL) {
-        LOGD ("Failed to open %s!!!\n", strTempFile.c_str ());
+        LOGW ("Failed to open %s!!!\n", strTempFile.c_str ());
         return false;
     }
 
@@ -170,7 +170,7 @@ EAPI bool isf_write_ise_info_list (const char *filename, std::vector<ISEINFO> &i
                                                    iter->icon, String (mode), String (option), iter->locales);
         if (fputs (line.c_str (), engine_list_file) < 0) {
             bSuccess = false;
-            LOGD ("Failed to write (%s)!!!\n", line.c_str ());
+            LOGW ("Failed to write (%s)!!!\n", line.c_str ());
             break;
         }
     }
@@ -178,13 +178,13 @@ EAPI bool isf_write_ise_info_list (const char *filename, std::vector<ISEINFO> &i
     int ret = fclose (engine_list_file);
     if (ret != 0) {
         bSuccess = false;
-        LOGD ("Failed to fclose %s!!!\n", strTempFile.c_str ());
+        LOGW ("Failed to fclose %s!!!\n", strTempFile.c_str ());
     }
 
     if (bSuccess) {
         if (rename (strTempFile.c_str (), filename) != 0) {
             bSuccess = false;
-            LOGD ("Failed to rename %s!!!\n", filename);
+            LOGW ("Failed to rename %s!!!\n", filename);
         }
     }
 
index 9b61cd7..6a0703e 100644 (file)
 #define Uses_SCIM_UTILITY
 #include "scim_private.h"
 #include <scim.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <unistd.h>
 #include <signal.h>
+#include <string.h>
 #include <privilege-control.h>
 
+#define WAIT_WM
+#define ISF_SYSTEM_WM_READY_FILE                        "/tmp/.wm_ready"
+#define ISF_SYSTEM_WM_WAIT_COUNT                        200
+#define ISF_SYSTEM_WAIT_DELAY                           100 * 1000
+
 using namespace scim;
 using std::cout;
 using std::cerr;
@@ -70,6 +77,254 @@ static bool check_socket_frontend (void)
     return true;
 }
 
+static bool check_panel (const String &display)
+{
+    SocketAddress address;
+    SocketClient client;
+
+    uint32 magic;
+
+    address.set_address (scim_get_default_panel_socket_address (display));
+
+    if (!client.connect (address))
+        return false;
+
+    if (!scim_socket_open_connection (magic,
+        String ("ConnectionTester"),
+        String ("Panel"),
+        client,
+        1000)) {
+            return false;
+    }
+
+    return true;
+}
+
+/**
+ * @brief Check the specific file.
+ *
+ * @param strFile The file path.
+ *
+ * @return true if the file is existed, otherwise false.
+ */
+static bool check_file (const char* strFile)
+{
+    struct stat st;
+
+    /* Workaround so that "/" returns a true, otherwise we can't monitor "/" in ecore_file_monitor */
+    if (stat (strFile, &st) < 0 && strcmp (strFile, "/"))
+        return false;
+    else
+        return true;
+}
+
+/**
+ * @brief : Checks whether the window manager is launched or not
+ * @return true if window manager launched, else false
+ */
+static bool check_wm_ready (void)
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+#ifdef WAIT_WM
+    int try_count = 0;
+    while (check_file (ISF_SYSTEM_WM_READY_FILE) == false) {
+        if (ISF_SYSTEM_WM_WAIT_COUNT <= (try_count++)) return false;
+        usleep (ISF_SYSTEM_WAIT_DELAY);
+    }
+#endif
+
+    return true;
+}
+
+/* The broker for launching OSP based IMEs */
+// {
+
+#include <Ecore.h>
+#include <Ecore_Ipc.h>
+#include <vconf.h>
+
+#ifndef SCIM_HELPER_LAUNCHER_PROGRAM
+#define SCIM_HELPER_LAUNCHER_PROGRAM  (SCIM_LIBEXECDIR "/scim-helper-launcher")
+#endif
+
+#define ISF_SYSTEM_APPSERVICE_READY_VCONF               "memory/appservice/status"
+#define ISF_SYSTEM_APPSERVICE_READY_STATE               2
+
+static Ecore_Ipc_Server *server = NULL;
+
+static Ecore_Event_Handler *exit_handler = NULL;
+static Ecore_Event_Handler *data_handler = NULL;
+
+static bool _appsvc_callback_regist = false;
+
+static char _ise_name[_POSIX_PATH_MAX + 1] = {0};
+static char _ise_uuid[_POSIX_PATH_MAX + 1] = {0};
+
+static void launch_helper (const char *name, const char *uuid);
+
+static void vconf_appservice_ready_changed (keynode_t *node, void *user_data)
+{
+    if (node && node->value.i >= ISF_SYSTEM_APPSERVICE_READY_STATE) {
+        if (_appsvc_callback_regist) {
+            vconf_ignore_key_changed (ISF_SYSTEM_APPSERVICE_READY_VCONF, vconf_appservice_ready_changed);
+            _appsvc_callback_regist = false;
+        }
+
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  vconf_appservice_ready_changed val : %d)\n",
+            time (0), getpid (), __FILE__, __func__, node->value.i);
+        isf_save_log (buf);
+
+        launch_helper (_ise_name, _ise_uuid);
+    }
+}
+
+static bool check_appservice_ready ()
+{
+    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
+
+    int ret = 0;
+    int val = 0;
+    ret = vconf_get_int (ISF_SYSTEM_APPSERVICE_READY_VCONF, &val);
+
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  vconf returned : %d, val : %d)\n",
+        time (0), getpid (), __FILE__, __func__, ret, val);
+    isf_save_log (buf);
+
+    if (ret == 0 && val >= ISF_SYSTEM_APPSERVICE_READY_STATE) {
+        return true;
+    } else {
+        /* Register a call back function for checking system ready */
+        if (!_appsvc_callback_regist) {
+            if (vconf_notify_key_changed (ISF_SYSTEM_APPSERVICE_READY_VCONF, vconf_appservice_ready_changed, NULL)) {
+                _appsvc_callback_regist = true;
+            }
+        }
+
+        return false;
+    }
+}
+
+static void launch_helper (const char *name, const char *uuid)
+{
+    int pid;
+
+    /* If appservice is not ready yet, let's return here */
+    if (!check_appservice_ready ()) return;
+
+    pid = fork ();
+
+    if (pid < 0) return;
+
+    if (pid == 0) {
+        if (exit_handler) ecore_event_handler_del (exit_handler);
+        if (data_handler) ecore_event_handler_del (data_handler);
+        if (server) ecore_ipc_server_del (server);
+        ecore_ipc_shutdown ();
+
+        const char *argv [] = { SCIM_HELPER_LAUNCHER_PROGRAM,
+            "--daemon",
+            "--config", "socket",
+            "--display", ":0",
+            _ise_name,
+            _ise_uuid,
+            0};
+
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Exec scim_helper_launcher(%s %s)\n",
+            time (0), getpid (), __FILE__, __func__, _ise_name, _ise_uuid);
+        isf_save_log (buf);
+
+        execv (SCIM_HELPER_LAUNCHER_PROGRAM, (char **)argv);
+        exit (-1);
+    }
+}
+
+static Eina_Bool sig_exit_cb (void *data, int ev_type, void *ev)
+{
+    ecore_main_loop_quit ();
+    return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool handler_client_data (void *data, int ev_type, void *ev)
+{
+    Ecore_Ipc_Event_Client_Data *e = (Ecore_Ipc_Event_Client_Data *)ev;
+    if (!e) return ECORE_CALLBACK_RENEW;
+
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  client %p sent [%i] [%i] [%i]\n",
+        time (0), getpid (), getppid (), __FILE__, __func__, e->client, e->major, e->minor, e->size);
+    isf_save_log (buf);
+
+    const char *message = "Done";
+    if (ecore_ipc_client_send (e->client, 0, 0, 0, 0, 0, message, strlen (message)) == 0) {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  ecore_ipc_client_send FAILED!!\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+    }
+
+    char buffer[_POSIX_PATH_MAX + 1] = {0};
+    strncpy (buffer, (char*)(e->data), _POSIX_PATH_MAX);
+
+    int blank_index = 0;
+    for (int loop = 0; loop < (int)strlen (buffer); loop++) {
+        if (buffer[loop] == ' ') {
+            blank_index = loop;
+        }
+    }
+    buffer[blank_index] = '\0';
+
+    /* Save the name and uuid for future use, just in case appservice was not ready yet */
+    strncpy (_ise_name, buffer, _POSIX_PATH_MAX);
+    strncpy (_ise_uuid, (char*)(buffer) + blank_index + 1, _POSIX_PATH_MAX);
+
+    launch_helper (_ise_name, _ise_uuid);
+
+    return ECORE_CALLBACK_RENEW;
+}
+
+static void run_broker (int argc, char *argv [])
+{
+    if (!ecore_init ()) {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Failed to init ecore!!\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+        return;
+    }
+
+    if (!ecore_ipc_init ()) {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Failed to init ecore_ipc!!\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+        ecore_shutdown ();
+        return;
+    }
+
+    exit_handler = ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, sig_exit_cb, NULL);
+    data_handler = ecore_event_handler_add (ECORE_IPC_EVENT_CLIENT_DATA, handler_client_data, NULL);
+
+    server = ecore_ipc_server_add (ECORE_IPC_LOCAL_SYSTEM, "scim-helper-broker", 0, NULL);
+
+    if (server == NULL) {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  ecore_ipc_server_add returned NULL!!\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+    }
+
+    ecore_main_loop_begin ();
+
+    ecore_ipc_server_del (server);
+    ecore_ipc_shutdown ();
+    ecore_shutdown ();
+}
+// }
+
 int main (int argc, char *argv [])
 {
     struct tms tiks_buf;
@@ -98,6 +353,18 @@ int main (int argc, char *argv [])
     int   new_argc = 0;
     char *new_argv [80];
 
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Waiting for wm_ready\n",
+        time (0), getpid (), getppid (), __FILE__, __func__);
+    isf_save_log (buf);
+
+    if (!check_wm_ready ()) {
+        std::cerr << "[ISF-PANEL-EFL] WM ready timeout\n";
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Window Manager ready timeout\n",
+            time (0), getpid (), getppid (), __FILE__, __func__);
+        isf_save_log (buf);
+    }
+
     /* Display version info */
     cout << "Input Service Manager " << ISF_VERSION << "\n\n";
 
@@ -253,6 +520,10 @@ int main (int argc, char *argv [])
 
     new_argv [new_argc] = 0;
 
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Starting SCIM......\n",
+        time (0), getpid (), getppid (), __FILE__, __func__);
+    isf_save_log (buf);
+
     /* Get the imengine module list which should be loaded. */
     if (exclude_engine_list.size ()) {
         load_engine_list.clear ();
@@ -289,6 +560,10 @@ int main (int argc, char *argv [])
 
     /* Try to start a SocketFrontEnd daemon first. */
     if (socket) {
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Now socket frontend......\n",
+            time (0), getpid (), getppid (), __FILE__, __func__);
+        isf_save_log (buf);
+
         /* If no Socket FrontEnd is running, then launch one.
            And set manual to false. */
         if (!check_socket_frontend ()) {
@@ -319,6 +594,10 @@ int main (int argc, char *argv [])
 
     cerr << "Launching a process with " << def_frontend << " FrontEnd...\n";
 
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Now default frontend......\n",
+        time (0), getpid (), getppid (), __FILE__, __func__);
+    isf_save_log (buf);
+
     /* Launch the scim process. */
     if (scim_launch (daemon,
                      def_config,
@@ -332,6 +611,22 @@ int main (int argc, char *argv [])
 
         gettime (clock_start, "ISM launch time");
 
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Now checking panel process......\n",
+            time (0), getpid (), getppid (), __FILE__, __func__);
+        isf_save_log (buf);
+
+        /* When finished launching scim-launcher, let's create panel process also, for the default display :0 */
+        if (!check_panel ("")) {
+            cerr << "Launching Panel...\n";
+            snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  Launching panel process......%s\n",
+                time (0), getpid (), getppid (), __FILE__, __func__, def_config.c_str ());
+            isf_save_log (buf);
+
+            scim_launch_panel (true, "socket", "", NULL);
+        }
+
+        run_broker (argc, argv);
+
         return 0;
     }
 
@@ -340,6 +635,8 @@ int main (int argc, char *argv [])
     else
         cerr << "ISM has exited abnormally.\n";
 
+    run_broker (argc, argv);
+
     return 1;
 }
 
index 0919db4..d95ea5f 100644 (file)
@@ -505,9 +505,8 @@ CommonBackEnd::initialize (const ConfigPointer       &config,
 {
     SCIM_DEBUG_BACKEND (1) << __FUNCTION__ << "...\n";
 
-    IMEngineFactoryPointer factory;
     std::vector<String>    new_modules = modules;
-
+    IMEngineFactoryPointer factory;
     int all_factories_count = 0;
     int module_factories_count = 0;
 
@@ -535,16 +534,6 @@ CommonBackEnd::initialize (const ConfigPointer       &config,
         return;
     }
 
-    factory = new ComposeKeyFactory ();
-
-    if (all_factories_count == 0 ||
-        std::find (m_impl->m_disabled_factories.begin (),
-                   m_impl->m_disabled_factories.end (),
-                   factory->get_uuid ()) == m_impl->m_disabled_factories.end ()) {
-        factory = m_impl->m_filter_manager->attach_filters_to_factory (factory);
-        add_factory (factory);
-    }
-
     if (is_load_info) {
         /*for (size_t i = 0; i < new_modules.size (); ++i)
             add_module_info (config, new_modules [i]);*/
@@ -557,6 +546,15 @@ CommonBackEnd::initialize (const ConfigPointer       &config,
         module_factories_count = add_module (config, new_modules [i], is_load_resource);
         all_factories_count += module_factories_count;
     }
+
+    factory = new ComposeKeyFactory ();
+    if (all_factories_count == 0 ||
+        std::find (m_impl->m_disabled_factories.begin (),
+                    m_impl->m_disabled_factories.end (),
+                    factory->get_uuid ()) == m_impl->m_disabled_factories.end ()) {
+        factory = m_impl->m_filter_manager->attach_filters_to_factory (factory);
+        add_factory (factory);
+    }
 }
 
 int
@@ -845,7 +843,7 @@ CommonBackEnd::add_imengine_module_info (const String module_name, const ConfigP
     String filename = String (USER_ENGINE_FILE_NAME);
     FILE *engine_list_file = fopen (filename.c_str (), "a");
     if (engine_list_file == NULL) {
-        LOGD ("Failed to open %s!!!\n", filename.c_str ());
+        LOGW ("Failed to open %s!!!\n", filename.c_str ());
         return;
     }
 
@@ -873,7 +871,7 @@ CommonBackEnd::add_imengine_module_info (const String module_name, const ConfigP
                 String line = isf_combine_ise_info_string (name, uuid, module_name, language,
                                                            icon, String (mode), String (option), factory->get_locales ());
                 if (fputs (line.c_str (), engine_list_file) < 0) {
-                    LOGD ("Failed to write (%s)!!!\n", line.c_str ());
+                    LOGW ("Failed to write (%s)!!!\n", line.c_str ());
                     break;
                 }
 
@@ -890,7 +888,7 @@ CommonBackEnd::add_imengine_module_info (const String module_name, const ConfigP
     ime_module.unload ();
     int ret = fclose (engine_list_file);
     if (ret != 0)
-        LOGD ("Failed to fclose %s!!!\n", filename.c_str ());
+        LOGW ("Failed to fclose %s!!!\n", filename.c_str ());
 }
 
 
index 42be142..7425eb3 100644 (file)
@@ -82,6 +82,8 @@ namespace scim {
 #define SCIM_GLOBAL_CONFIG_DEFAULT_SOCKET_TIMEOUT                   "/DefaultSocketTimeout"
 #define SCIM_GLOBAL_CONFIG_GTKSOCKET_WINDOW_ID                      "/IMWindowSocketID"
 #define SCIM_GLOBAL_CONFIG_GTKSOCKET_WINDOW_STYLE                   "/IMWindowStyle"
+#define SCIM_GLOBAL_CONFIG_PANEL_SOUND_FEEDBACK                     "/Panel/CandidateSoundFeedback"
+#define SCIM_GLOBAL_CONFIG_PANEL_VIBRATION_FEEDBACK                 "/Panel/CandidateVibrationFeedback"
 
 #define SCIM_GLOBAL_CONFIG_INITIAL_ISE_TYPE                         "/InitialIseType"
 #define SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID                         "/InitialIseUuid"
index db964f2..65109c9 100644 (file)
@@ -182,6 +182,12 @@ public:
 
             m_orig->signal_connect_delete_surrounding_text (
                 slot (this, &FilterInstanceBase::FilterInstanceBaseImpl::slot_delete_surrounding_text));
+
+            m_orig->signal_connect_get_selection (
+                slot (this, &FilterInstanceBase::FilterInstanceBaseImpl::slot_get_selection));
+
+            m_orig->signal_connect_set_selection (
+                slot (this, &FilterInstanceBase::FilterInstanceBaseImpl::slot_set_selection));
         }
     }
 
@@ -317,6 +323,14 @@ private:
     bool slot_delete_surrounding_text(IMEngineInstanceBase * si, int offset, int len) {
         return m_parent->filter_delete_surrounding_text (offset, len);
     }
+
+    bool slot_get_selection          (IMEngineInstanceBase * si, WideString &text) {
+        return m_parent->filter_get_selection (text);
+    }
+
+    bool slot_set_selection          (IMEngineInstanceBase * si, int start, int end) {
+        return m_parent->filter_set_selection (start, end);
+    }
 };
 
 FilterInstanceBase::FilterInstanceBase (FilterFactoryBase     *factory,
@@ -532,6 +546,18 @@ FilterInstanceBase::filter_delete_surrounding_text (int offset, int len)
     return delete_surrounding_text (offset, len);
 }
 
+bool
+FilterInstanceBase::filter_get_selection (WideString &text)
+{
+    return get_selection (text);
+}
+
+bool
+FilterInstanceBase::filter_set_selection (int start, int end)
+{
+    return set_selection (start, end);
+}
+
 } // namespace scim
 
 /*
index f54ef87..2ba8807 100644 (file)
@@ -386,6 +386,8 @@ protected:
     virtual void filter_send_helper_event (const String &helper_uuid, const Transaction &trans);
     virtual bool filter_get_surrounding_text (WideString &text, int &cursor, int maxlen_before = -1, int maxlen_after = -1);
     virtual bool filter_delete_surrounding_text (int offset, int len);
+    virtual bool filter_get_selection (WideString &text);
+    virtual bool filter_set_selection (int start, int end);
     /** @} */
 };
 
index 86ecb7f..93f53ae 100644 (file)
@@ -43,10 +43,13 @@ namespace scim {
 
 #if SCIM_USE_STL_EXT_HASH_MAP
 typedef __gnu_cxx::hash_map <int, IMEngineInstancePointer, __gnu_cxx::hash <int> >  IMEngineInstanceRepository;
+typedef __gnu_cxx::hash_map <int, int, __gnu_cxx::hash <int> >                      IMEngineInstanceRefCount;
 #elif SCIM_USE_STL_HASH_MAP
 typedef std::hash_map <int, IMEngineInstancePointer, std::::hash <int> >            IMEngineInstanceRepository;
+typedef std::hash_map <int, int, std::::hash <int> >                                IMEngineInstanceRefCount;
 #else
 typedef std::map <int, IMEngineInstancePointer>                                     IMEngineInstanceRepository;
+typedef std::map <int, int>                                                         IMEngineInstanceRefCount;
 #endif
 
 class FrontEndBase::FrontEndBaseImpl
@@ -55,6 +58,7 @@ public:
     FrontEndBase               *m_frontend;
     BackEndPointer              m_backend;
     IMEngineInstanceRepository  m_instance_repository;
+    IMEngineInstanceRefCount    m_instance_ref_count;
 
     int                         m_instance_count;
 public:
@@ -151,6 +155,14 @@ public:
         return m_frontend->delete_surrounding_text (si->get_id (), offset, len);
     }
 
+    bool slot_get_selection  (IMEngineInstanceBase * si, WideString &text) {
+        return m_frontend->get_selection (si->get_id (), text);
+    }
+
+    bool slot_set_selection(IMEngineInstanceBase * si, int start, int end) {
+        return m_frontend->set_selection (si->get_id (), start, end);
+    }
+
     void slot_expand_candidate      (IMEngineInstanceBase * si) {
         m_frontend->expand_candidate (si->get_id ());
     }
@@ -218,6 +230,12 @@ public:
         si->signal_connect_delete_surrounding_text (
             slot (this, &FrontEndBase::FrontEndBaseImpl::slot_delete_surrounding_text));
 
+        si->signal_connect_get_selection (
+            slot (this, &FrontEndBase::FrontEndBaseImpl::slot_get_selection));
+
+        si->signal_connect_set_selection (
+            slot (this, &FrontEndBase::FrontEndBaseImpl::slot_set_selection));
+
         si->signal_connect_expand_candidate (
             slot (this, &FrontEndBase::FrontEndBaseImpl::slot_expand_candidate));
 
@@ -411,22 +429,34 @@ FrontEndBase::new_instance (const ConfigPointer &config, const String &sf_uuid,
         std::cerr << "IMEngineFactory " << sf_uuid << " does not support encoding " << encoding << "\n";
         return -1;
     }
-
-    IMEngineInstancePointer si = factory->create_instance (encoding, m_impl->m_instance_count);
-
-    if (si.null ()) {
-        std::cerr << "IMEngineFactory " << sf_uuid << " failed to create new instance!\n";
-        return -1;
+    IMEngineInstancePointer si;
+    bool ret = false;
+    IMEngineInstanceRepository::iterator it = m_impl->m_instance_repository.begin ();
+    for (; it != m_impl->m_instance_repository.end (); it++) {
+        if(sf_uuid == get_instance_uuid (it->first)) {
+            si = it->second;
+            ret = true;
+            break;
+        }
     }
+    if (ret == false) {
+        si = factory->create_instance (encoding, m_impl->m_instance_count);
+        if (si.null ()) {
+            std::cerr << "IMEngineFactory " << sf_uuid << " failed to create new instance!\n";
+            return -1;
+        }
 
-    ++m_impl->m_instance_count;
-
-    if (m_impl->m_instance_count < 0)
-        m_impl->m_instance_count = 0;
+        ++m_impl->m_instance_count;
 
-    m_impl->m_instance_repository [si->get_id ()] = si;
+        if (m_impl->m_instance_count < 0)
+            m_impl->m_instance_count = 0;
 
-    m_impl->attach_instance (si);
+        m_impl->m_instance_repository [si->get_id ()] = si;
+        m_impl->m_instance_ref_count [si->get_id ()] = 1;
+        m_impl->attach_instance (si);
+    } else {
+        m_impl->m_instance_ref_count [si->get_id ()] = ++m_impl->m_instance_ref_count [si->get_id ()];
+    }
 
     return si->get_id ();
 }
@@ -447,14 +477,23 @@ FrontEndBase::replace_instance (int si_id, const String &sf_uuid)
             return true;
 
         String encoding = it->second->get_encoding ();
-        if (sf->validate_encoding (encoding)) {
-            IMEngineInstancePointer si = sf->create_instance (encoding, si_id);
-            if (!si.null ()) {
-                it->second = si;
-                m_impl->attach_instance (it->second);
+        if (!sf->validate_encoding (encoding)) {
+            std::cerr << "IMEngineFactory " << sf_uuid << " does not support encoding " << encoding << "\n";
+            return false;
+        }
+        IMEngineInstanceRepository::iterator it1;
+        for (it1 = m_impl->m_instance_repository.begin (); it1 != m_impl->m_instance_repository.end (); it1++) {
+            if (it1->second->get_factory_uuid () == sf_uuid) {
+                it->second = it1->second;
                 return true;
             }
         }
+        IMEngineInstancePointer si = sf->create_instance (encoding, si_id);
+        if (!si.null ()) {
+            it->second = si;
+            m_impl->attach_instance (it->second);
+            return true;
+        }
     }
 
     std::cerr << "Cannot find IMEngine Instance " << si_id << " to replace.\n";
@@ -468,44 +507,44 @@ FrontEndBase::delete_instance (int id)
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " id:" << id << "\n";
 
     String del_uuid;
-    bool ret = false;
-
     dump_instances ();
-
     IMEngineInstanceRepository::iterator it = m_impl->m_instance_repository.find (id);
-
     if (it != m_impl->m_instance_repository.end ()) {
         SCIM_DEBUG_FRONTEND(1) << "delete_instance:" << it->second->get_factory_uuid () << "\n";
-        del_uuid = it->second->get_factory_uuid ();
-        m_impl->m_instance_repository.erase (it);
-        ret = true;
-    }
-
-    if (ret) {
-        std::vector<String> use_uuids;
-
-        use_uuids.clear ();
-        for (it = m_impl->m_instance_repository.begin (); it != m_impl->m_instance_repository.end (); it++) {
-            std::vector<String>::iterator it2 = use_uuids.begin ();
-
-            for (; it2 != use_uuids.end (); it2++) {
-                if (*it2 == it->second->get_factory_uuid ())
-                    break;
+        int ref_count = m_impl->m_instance_ref_count [id];
+        m_impl->m_instance_ref_count [id] = --ref_count;
+        if (ref_count <= 0) {
+            del_uuid = it->second->get_factory_uuid ();
+            m_impl->m_instance_repository.erase (it);
+            IMEngineInstanceRefCount::iterator ref_count_it = m_impl->m_instance_ref_count.find(id);
+            if (ref_count_it != m_impl->m_instance_ref_count.end ()) {
+                m_impl->m_instance_ref_count.erase (ref_count_it);
             }
-
-            if (it2 == use_uuids.end ())
-                use_uuids.push_back (it->second->get_factory_uuid ());
+            std::vector<String> use_uuids;
+            use_uuids.clear ();
+            for (it = m_impl->m_instance_repository.begin (); it != m_impl->m_instance_repository.end (); it++) {
+                std::vector<String>::iterator it2 = use_uuids.begin ();
+                for (; it2 != use_uuids.end (); it2++) {
+                    if (*it2 == it->second->get_factory_uuid ())
+                        break;
+                }
+
+                if (it2 == use_uuids.end ())
+                    use_uuids.push_back (it->second->get_factory_uuid ());
+            }
+            m_impl->m_backend->release_module (use_uuids, del_uuid);
         }
-        m_impl->m_backend->release_module (use_uuids, del_uuid);
+        return true;
     }
-
-    return ret;
+    std::cerr << "Cannot find IMEngine Instance " << id << " to delete.\n";
+    return false;
 }
 
 void
 FrontEndBase::delete_all_instances ()
 {
     m_impl->m_instance_repository.clear ();
+    m_impl->m_instance_ref_count.clear ();
 }
 
 String
@@ -858,6 +897,16 @@ FrontEndBase::delete_surrounding_text  (int id, int offset, int len)
 {
     return false;
 }
+bool
+FrontEndBase::get_selection  (int id, WideString &text)
+{
+    return false;
+}
+bool
+FrontEndBase::set_selection  (int id, int start, int end)
+{
+    return false;
+}
 void
 FrontEndBase::expand_candidate (int id)
 {
index fbab061..5550b9d 100644 (file)
@@ -108,7 +108,7 @@ protected:
      */
 
     /**
-     * @brief Add one IMEngine module in BackEnd
+     * @brief Add one IMEngine module in BackEnd.
      *
      *
      * @return void.
@@ -116,7 +116,7 @@ protected:
     void add_module (const ConfigPointer &config, const String module, bool is_load_resource) const;
 
     /**
-     * @brief Add one IMEngine module info in BackEnd
+     * @brief Add one IMEngine module info in BackEnd.
      *
      *
      * @return void.
@@ -124,7 +124,7 @@ protected:
     void add_module_info (const ConfigPointer &config, const String module) const;
 
     /**
-     * @brief Get the IMEngine factories list for specific encoding
+     * @brief Get the IMEngine factories list for specific encoding.
      *
      * @param uuids    the vector to store the factories' uuids which
      *                 support the encoding.
@@ -136,10 +136,10 @@ protected:
     uint32 get_factory_list_for_encoding (std::vector<String> &uuids, const String &encoding) const;
 
     /**
-     * @brief Get the IMEngine factories list for specific language
+     * @brief Get the IMEngine factories list for specific language.
      *
      * @param uuids    the vector to store the factories' uuids which
-     *                 support the encoding.
+     *                 support the language.
      * @param language the language to be queried. If empty,
      *                 all IMEngine factories will be returned.
      *
@@ -147,6 +147,13 @@ protected:
      */
     uint32 get_factory_list_for_language (std::vector<String> &uuids, const String &language) const;
 
+    /**
+     * @brief Get the IMEngine factories list.
+     *
+     * @param uuids the vector to store the existing factories' uuids.
+     *
+     * @return the number of IMEngine factories found.
+     */
     uint32 get_factory_list (std::vector<String> &uuids) const;
 
     /**
@@ -346,8 +353,16 @@ protected:
      */
     String get_instance_icon_file (int id) const;
 
+    /**
+     * @brief get the name list of existing IMEngine instances.
+     * @param vec the vector to store the name of existing IMEngine instances,
+     *         aka. the name of its factory.
+     */
     void get_instance_list(std::vector<String> &vec) const;
 
+    /**
+     * @brief output uuid of existing IMEngine instances to scim debug.
+     */
     void dump_instances ();
 
     /**
@@ -688,6 +703,28 @@ protected:
     virtual bool delete_surrounding_text  (int id, int offset, int len);
 
     /**
+     * @brief Retrieves selection text.
+     *
+     * @param id            the id of the IMEngine instance. It must have been focused in.
+     * @param text          location to store the context string selected.
+     *
+     * @return true if selection text was provided.
+     */
+
+    virtual bool get_selection  (int id, WideString &text);
+
+    /**
+     * @brief Ask the client to select around the cursor position.
+     *
+     * @param id     the id of the IMEngine instance. It must have been focused in.
+     * @param start  start position in chars;
+     * @param end    end position in chars.
+     *
+     * @return true if the signal was handled.
+     */
+    virtual bool set_selection  (int id, int start, int end);
+
+    /**
      * @brief Request to expand candidate window.
      *
      * @param id the id of the IMEngine instance. It must have been focused in.
index 6419ab0..41db479 100644 (file)
@@ -105,6 +105,9 @@ typedef Signal2<void, const HelperAgent *, const std::vector<uint32> &>
 typedef Signal2<void, const HelperAgent *, LookupTable &>
         HelperAgentSignalLookupTable;
 
+typedef Signal3<void, const HelperAgent *, KeyEvent &, uint32 &>
+        HelperAgentSignalKeyEventUint;
+
 class HelperAgent::HelperAgentImpl
 {
 public:
@@ -125,6 +128,7 @@ public:
     HelperAgentSignalIntInt         signal_update_spot_location;
     HelperAgentSignalInt            signal_update_cursor_position;
     HelperAgentSignalInt            signal_update_surrounding_text;
+    HelperAgentSignalVoid           signal_update_selection;
     HelperAgentSignalString         signal_trigger_property;
     HelperAgentSignalTransaction    signal_process_imengine_event;
     HelperAgentSignalVoid           signal_focus_out;
@@ -168,6 +172,7 @@ public:
     HelperAgentSignalUintVoid           signal_turn_on_log;
     HelperAgentSignalInt                signal_update_displayed_candidate_number;
     HelperAgentSignalInt                signal_longpress_candidate;
+    HelperAgentSignalKeyEventUint       signal_process_key_event;
 
 public:
     HelperAgentImpl () : magic (0), magic_active (0), timeout (-1), focused_ic ((uint32) -1) { }
@@ -205,44 +210,67 @@ HelperAgent::open_connection (const HelperInfo &info,
 
     if (!address.valid ())
         return -1;
-    bool ret;
-    int  i;
-    ret = m_impl->socket.connect (address);
-    if (ret == false) {
+
+    int i = 0;
+    std::cerr << " Connecting to PanelAgent server.";
+    ISF_LOG (" Connecting to PanelAgent server.\n");
+    while (!m_impl->socket.connect (address)) {
+        std::cerr << ".";
         scim_usleep (100000);
-        std::cerr << " Re-connecting to PanelAgent server.";
-        ISF_LOG (" Re-connecting to PanelAgent server.\n");
-        for (i = 0; i < 200; ++i) {
-            if (m_impl->socket.connect (address)) {
-                ret = true;
-                break;
-            }
-            std::cerr << ".";
-            scim_usleep (100000);
+        if (++i == 200) {
+            std::cerr << "m_impl->socket.connect () is failed!!!\n";
+            ISF_LOG ("m_impl->socket.connect () is failed!!!\n");
+            return -1;
         }
-        std::cerr << " Connected :" << i << "\n";
-        ISF_LOG ("  Connected :%d\n", i);
     }
-
-    if (ret == false)
+    std::cerr << " Connected :" << i << "\n";
+    ISF_LOG ("  Connected :%d\n", i);
     {
-        std::cerr << "m_impl->socket.connect () is failed!!!\n";
-        ISF_LOG ("m_impl->socket.connect () is failed!!!\n");
-        return -1;
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Connection to PanelAgent succeeded, %d\n",
+            time (0), getpid (), __FILE__, __func__, i);
+        isf_save_log (buf);
     }
 
-    if (!scim_socket_open_connection (magic,
+    /* Let's retry 10 times when failed */
+    int open_connection_retries = 0;
+    while (!scim_socket_open_connection (magic,
                                       String ("Helper"),
                                       String ("Panel"),
                                       m_impl->socket,
                                       timeout)) {
-        m_impl->socket.close ();
-        std::cerr << "scim_socket_open_connection () is failed!!!\n";
-        ISF_LOG ("scim_socket_open_connection () is failed!!!\n");
-        return -1;
+        if (++open_connection_retries > 10) {
+            m_impl->socket.close ();
+            std::cerr << "scim_socket_open_connection () is failed!!!\n";
+            ISF_LOG ("scim_socket_open_connection () is failed!!!\n");
+            {
+                char buf[256] = {0};
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  scim_socket_open_connection failed, %d\n",
+                    time (0), getpid (), __FILE__, __func__, timeout);
+                isf_save_log (buf);
+            }
+            return -1;
+        }
+
+        /* Retry after re-connecting the socket */
+        if (m_impl->socket.is_connected ())
+            close_connection ();
+
+        /* This time, just retry atmost 2 seconds */
+        i = 0;
+        while (!m_impl->socket.connect (address) && ++i < 10) {
+            scim_usleep (200000);
+        }
+
     }
 
     ISF_LOG ("scim_socket_open_connection () is successful.\n");
+    {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  scim_socket_open_connection successful\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+    }
     m_impl->send.clear ();
     m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST);
     m_impl->send.put_data (magic);
@@ -288,6 +316,12 @@ HelperAgent::open_connection (const HelperInfo &info,
         }
     }
 
+    {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Trying connect() with Helper_Active\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
+    }
     /* connect to the panel agent as the active helper client */
     if (!m_impl->socket_active.connect (address)) return -1;
     if (!scim_socket_open_connection (magic,
@@ -296,6 +330,12 @@ HelperAgent::open_connection (const HelperInfo &info,
                                       m_impl->socket_active,
                                       timeout)) {
         m_impl->socket_active.close ();
+        {
+            char buf[256] = {0};
+            snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Helper_Active scim_socket_open_connection() failed %d\n",
+                time (0), getpid (), __FILE__, __func__, timeout);
+            isf_save_log (buf);
+        }
         return -1;
     }
 
@@ -312,6 +352,12 @@ HelperAgent::open_connection (const HelperInfo &info,
     m_impl->send.put_data (info.option);
 
     if (!m_impl->send.write_to_socket (m_impl->socket_active, magic)) {
+        {
+            char buf[256] = {0};
+            snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Helper_Active write_to_socket() failed\n",
+                time (0), getpid (), __FILE__, __func__);
+            isf_save_log (buf);
+        }
         m_impl->socket_active.close ();
         return -1;
     }
@@ -445,6 +491,13 @@ HelperAgent::filter_event ()
                     m_impl->signal_update_surrounding_text (this, ic, text, (int) cursor);
                 break;
             }
+            case ISM_TRANS_CMD_UPDATE_SELECTION:
+            {
+                String text;
+                if (m_impl->recv.get_data (text))
+                    m_impl->signal_update_selection (this, ic, text);
+                break;
+            }
             case SCIM_TRANS_CMD_TRIGGER_PROPERTY:
             {
                 String property;
@@ -607,6 +660,18 @@ HelperAgent::filter_event ()
                 m_impl->send.write_to_socket (m_impl->socket);
                 break;
             }
+            case SCIM_TRANS_CMD_PROCESS_KEY_EVENT:
+            {
+                KeyEvent key;
+                uint32 ret = 0;
+                if (m_impl->recv.get_data (key))
+                    m_impl->signal_process_key_event(this, key, ret);
+                m_impl->send.clear ();
+                m_impl->send.put_command (SCIM_TRANS_CMD_REPLY);
+                m_impl->send.put_data (ret);
+                m_impl->send.write_to_socket (m_impl->socket);
+                break;
+            }
             case ISM_TRANS_CMD_SET_LAYOUT:
             {
                 uint32 layout;
@@ -977,6 +1042,28 @@ HelperAgent::commit_string (int               ic,
     }
 }
 
+void
+HelperAgent::commit_string (int               ic,
+                            const String     &ic_uuid,
+                            const  char      *buf,
+                            int               buflen) const
+{
+    if (m_impl->socket_active.is_connected ()) {
+        m_impl->send.clear ();
+        m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST);
+        m_impl->send.put_data (m_impl->magic_active);
+        m_impl->send.put_command (SCIM_TRANS_CMD_COMMIT_STRING);
+        if (ic == -1) {
+            m_impl->send.put_data (m_impl->focused_ic);
+        } else {
+            m_impl->send.put_data ((uint32)ic);
+        }
+        m_impl->send.put_data (ic_uuid);
+        m_impl->send.put_dataw (buf, buflen);
+        m_impl->send.write_to_socket (m_impl->socket_active, m_impl->magic_active);
+    }
+}
+
 /**
  * @brief Request to show preedit string.
  *
@@ -1132,6 +1219,16 @@ HelperAgent::update_preedit_string (int                  ic,
     update_preedit_string (ic, ic_uuid, str, attrs, -1);
 }
 
+void
+HelperAgent::update_preedit_string (int                  ic,
+                                    const String        &ic_uuid,
+                                    const char         *buf,
+                                    int                 buflen,
+                                    const AttributeList &attrs) const
+{
+    update_preedit_string (ic, ic_uuid, buf, buflen, attrs, -1);
+}
+
 /**
  * @brief Update a new WideString for preedit.
  *
@@ -1164,6 +1261,28 @@ HelperAgent::update_preedit_string (int                  ic,
     }
 }
 
+void
+HelperAgent::update_preedit_string (int                 ic,
+                                    const String       &ic_uuid,
+                                    const char         *buf,
+                                    int                 buflen,
+                                    const AttributeList &attrs,
+                                    int            caret) const
+{
+    if (m_impl->socket_active.is_connected ()) {
+        m_impl->send.clear ();
+        m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST);
+        m_impl->send.put_data (m_impl->magic_active);
+        m_impl->send.put_command (SCIM_TRANS_CMD_UPDATE_PREEDIT_STRING);
+        m_impl->send.put_data ((uint32)ic);
+        m_impl->send.put_data (ic_uuid);
+        m_impl->send.put_dataw (buf, buflen);
+        m_impl->send.put_data (attrs);
+        m_impl->send.put_data (caret);
+        m_impl->send.write_to_socket (m_impl->socket_active, m_impl->magic_active);
+    }
+}
+
 /**
  * @brief Update the preedit caret position in the preedit string.
  *
@@ -1303,6 +1422,44 @@ HelperAgent::delete_surrounding_text (int offset, int len) const
 }
 
 /**
+ * @brief Request to get selection text.
+ *
+ * @param uuid The helper ISE UUID.
+ */
+void
+HelperAgent::get_selection (const String &uuid) const
+{
+    if (m_impl->socket_active.is_connected ()) {
+        m_impl->send.clear ();
+        m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST);
+        m_impl->send.put_data (m_impl->magic_active);
+        m_impl->send.put_command (SCIM_TRANS_CMD_GET_SELECTION);
+        m_impl->send.put_data (uuid);
+        m_impl->send.write_to_socket (m_impl->socket_active, m_impl->magic_active);
+    }
+}
+
+/**
+ * @brief Request to selected text.
+ *
+ * @param start The start position in text.
+ * @param end The end position in text.
+ */
+void
+HelperAgent::set_selection (int start, int end) const
+{
+    if (m_impl->socket_active.is_connected ()) {
+        m_impl->send.clear ();
+        m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST);
+        m_impl->send.put_data (m_impl->magic_active);
+        m_impl->send.put_command (SCIM_TRANS_CMD_SET_SELECTION);
+        m_impl->send.put_data (start);
+        m_impl->send.put_data (end);
+        m_impl->send.write_to_socket (m_impl->socket_active, m_impl->magic_active);
+    }
+}
+
+/**
  * @brief Request to get uuid list of all keyboard ISEs.
  *
  * @param uuid The helper ISE UUID.
@@ -1670,6 +1827,20 @@ HelperAgent::signal_connect_update_surrounding_text (HelperAgentSlotInt *slot)
 }
 
 /**
+ * @brief Connect a slot to Helper update selection signal.
+ *
+ * This signal is used to let the Helper get the selection.
+ *
+ * The prototype of the slot is:
+ * void update_selection (const HelperAgent *agent, int ic, const String &text);
+ */
+Connection
+HelperAgent::signal_connect_update_selection (HelperAgentSlotVoid *slot)
+{
+    return m_impl->signal_update_selection.connect (slot);
+}
+
+/**
  * @brief Connect a slot to Helper trigger property signal.
  *
  * This signal is used to trigger a property registered by this Helper.
@@ -1881,6 +2052,20 @@ HelperAgent::signal_connect_set_return_key_disable (HelperAgentSlotUintVoid *slo
 }
 
 /**
+ * @brief Connect a slot to Helper process key event signal.
+ *
+ * This signal is used to send keyboard key event to Helper ISE.
+ *
+ * The prototype of the slot is:
+ * void process_key_event (const HelperAgent *agent, uint32 &ret);
+ */
+Connection
+HelperAgent::signal_connect_process_key_event (HelperAgentSlotKeyEventUint *slot)
+{
+    return m_impl->signal_process_key_event.connect (slot);
+}
+
+/**
  * @brief Connect a slot to Helper get return key disable signal.
  *
  * This signal is used to get return key disable from Helper ISE.
index 156d4b1..a9dc54e 100644 (file)
@@ -108,9 +108,9 @@ const uint32 SCIM_HELPER_NEED_SCREEN_INFO        = (1<<3);
 const uint32 SCIM_HELPER_NEED_SPOT_LOCATION_INFO = (1<<4);
 
 /**
- * @brief ISE option indicates whether it should be full style
+ * @brief ISE option indicates whether helper ISE handles the keyboard keyevent
  */
-const uint32 ISM_ISE_FULL_STYLE                  = (1<<16);
+const uint32 ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT = (1<<16);
 
 /**
  * @brief ISE option indicates whether it should be hidden in control panel.
@@ -201,6 +201,8 @@ typedef Slot2<void, const HelperAgent *, const std::vector<uint32> &>
 
 typedef Slot2<void, const HelperAgent *, LookupTable &>
         HelperAgentSlotLookupTable;
+typedef Slot3<void, const HelperAgent *, KeyEvent &, uint32 &>
+        HelperAgentSlotKeyEventUint;
 
 /**
  * @brief The accessory class to write a Helper object.
@@ -365,6 +367,21 @@ public:
                                  const WideString   &wstr) const;
 
     /**
+     * @brief Commit a WideString to client application directly.
+     *
+     * @param ic The handle of the client Input Context to receive the commit string.
+     *        -1 means the currently focused Input Context.
+     * @param ic_uuid The UUID of the IMEngine used by the Input Context.
+     *        Empty means don't match.
+     * @param buf The byte array of UTF-8 string to be committed.
+     * @param buflen The buf size in bytes.
+     */
+    void commit_string          (int                 ic,
+                                 const String       &ic_uuid,
+                                 const char         *buf,
+                                 int                 buflen) const;
+
+    /**
      * @brief Request to show preedit string.
      *
      * @param ic The handle of the client Input Context to receive the request.
@@ -431,6 +448,12 @@ public:
                                  const WideString   &wstr,
                                  const AttributeList &attrs) const;
 
+    void update_preedit_string  (int                 ic,
+                                 const String       &ic_uuid,
+                                 const char         *buf,
+                                 int                 buflen,
+                                 const AttributeList &attrs) const;
+
     /**
      * @brief Update a new WideString and caret for preedit.
      *
@@ -448,6 +471,13 @@ public:
                                  const AttributeList &attrs,
                                  int                 caret) const;
 
+    void update_preedit_string  (int                 ic,
+                                 const String       &ic_uuid,
+                                 const char         *buf,
+                                 int                 buflen,
+                                 const AttributeList &attrs,
+                                 int                 caret) const;
+
     /**
      * @brief Update a new string for aux.
      *
@@ -502,6 +532,22 @@ public:
                                    int                          len) const;
 
     /**
+     * @brief Request to get selection.
+     *
+     * @param uuid The helper ISE UUID.
+     */
+    void get_selection       (const String                &uuid) const;
+
+    /**
+     * @brief Request to selected text.
+     *
+     * @param start The start position in text.
+     * @param end The end position in text.
+     */
+    void set_selection       (int                          start,
+                              int                          end) const;
+
+    /**
      * @brief Set candidate position in screen.
      *
      * @param left The x position in screen.
@@ -706,6 +752,16 @@ public:
     Connection signal_connect_update_surrounding_text (HelperAgentSlotInt        *slot);
 
     /**
+     * @brief Connect a slot to Helper update selection signal.
+     *
+     * This signal is used to let the Helper get the selection.
+     *
+     * The prototype of the slot is:
+     * void update_selection (const HelperAgent *agent, int ic, const String &text);
+     */
+    Connection signal_connect_update_selection (HelperAgentSlotVoid        *slot);
+
+    /**
      * @brief Connect a slot to Helper trigger property signal.
      *
      * This signal is used to trigger a property registered by this Helper.
@@ -1115,6 +1171,14 @@ public:
      * void update_candidate_item_layout (const HelperAgent *, const std::vector<uint32> &row_items);
      */
     Connection signal_connect_update_candidate_item_layout      (HelperAgentSlotUintVector          *slot);
+
+     /**
+     * @brief Connect a slot to Helper process key event signal.
+     *
+     * The prototype of the slot is:
+     * void process_key_event (const HelperAgent *, uint32 &ret);
+     */
+    Connection signal_connect_process_key_event (HelperAgentSlotKeyEventUint *slot);
 };
 
 /**  @} */
index 508d524..226073b 100644 (file)
@@ -35,9 +35,9 @@
 #include <stdlib.h>
 #include "scim_private.h"
 #include "scim.h"
-#include "ise_preexec.h"
 #include <privilege-control.h>
 #include <unistd.h>
+#include "ise_preexec.h"
 
 using namespace scim;
 
@@ -143,14 +143,19 @@ int main (int argc, char *argv [])
             continue;
         }
 
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Invalid command line option: %d %s...\n",
+            time (0), getpid (), __FILE__, __func__, i, argv [i]);
+        isf_save_log (buf);
+
         std::cerr << "Invalid command line option: " << argv [i] << "\n";
         return -1;
     }
 
     SCIM_DEBUG_MAIN(1) << "scim-helper-launcher: " << config << " " << display << " " << helper << " " << uuid << "\n";
     char buf[256] = {0};
-    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Helper ISE (%s) is launching...\n",
-        time (0), getpid (), __FILE__, __func__, uuid.c_str ());
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Helper ISE (%s %s) is launching...\n",
+        time (0), getpid (), __FILE__, __func__, helper.c_str (), uuid.c_str ());
     isf_save_log (buf);
 
     if (!helper.length () || !uuid.length ()) {
@@ -158,7 +163,17 @@ int main (int argc, char *argv [])
         return -1;
     }
 
-    ise_preexec (helper.c_str ());
+    int ret = ise_preexec (helper.c_str (), uuid.c_str ());
+    if (ret < 0) {
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  ise_preexec failed (%s, %d)\n",
+            time (0), getpid (), __FILE__, __func__, helper.c_str (), ret);
+        isf_save_log (buf);
+
+        std::cerr << "ise_preexec failed(" << helper << ret << ")\n";
+        return -1;
+    }
+
+    set_app_privilege ("isf", NULL, NULL);
 
     HelperModule helper_module (helper);
 
index 9aa1760..381f76d 100644 (file)
@@ -279,7 +279,9 @@ public:
                 bool bConnected = false;
 
                 std::cerr << " Connecting to ISF(scim) server.";
-                for (i = 0; i < 50; ++i) {
+
+                /* Make sure we are not waiting for more than 10 second */
+                for (i = 0; i < 100; ++i) {
                     if (m_socket_client.connect (address)) {
                         bConnected = true;
                         break;
@@ -289,7 +291,8 @@ public:
                 }
                 std::cerr << " Connected :" << i << "\n";
 
-                if (!bConnected) {
+                /* Do not launch SocketFrontEnd process here, let the immodule to create SocketFrontEnd process */
+                if (false && !bConnected) {
                     /* Get modules list */
                     std::vector<String> engine_list;
                     std::vector<String> helper_list;
@@ -314,7 +317,7 @@ public:
                                  (char **)new_argv);
 
                     std::cerr << " Reconnecting to ISF(scim) server.";
-                    for (i = 0; i < 50; ++i) {
+                    for (i = 0; i < 100; ++i) {
                         if (m_socket_client.connect (address))
                             break;
                         scim_usleep (100000);
@@ -360,7 +363,7 @@ public:
             if (trans.write_to_socket (m_socket_client) &&
                 trans.read_from_socket (m_socket_client, m_socket_timeout) &&
                 trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY &&
-                trans.get_data (num) && num > 0) {
+                trans.get_data (num) && num >= 0) {
                 for (uint32 j = 0; j < num; j++) {
                     HelperInfo info;
                     if (trans.get_data (info.uuid) &&
@@ -373,10 +376,6 @@ public:
                 }
                 return;
             }
-
-            m_socket_client.close ();
-            if (!open_connection ())
-                break;
         }
     }
 };
index f49ca2d..d417a46 100644 (file)
@@ -88,6 +88,12 @@ typedef Signal5<bool, IMEngineInstanceBase*,WideString&,int&,int,int>
 typedef Signal3<bool, IMEngineInstanceBase*,int,int>
         IMEngineSignalDeleteSurroundingText;
 
+typedef Signal2<bool, IMEngineInstanceBase*,WideString&>
+        IMEngineSignalGetSelection;
+
+typedef Signal3<bool, IMEngineInstanceBase*,int,int>
+        IMEngineSignalSetSelection;
+
 typedef Signal3<void, IMEngineInstanceBase*,ISF_CANDIDATE_PORTRAIT_LINE_T,ISF_CANDIDATE_MODE_T>
         IMEngineSignalCandidateStyle;
 
@@ -133,6 +139,9 @@ public:
     IMEngineSignalGetSurroundingText      m_signal_get_surrounding_text;
     IMEngineSignalDeleteSurroundingText   m_signal_delete_surrounding_text;
 
+    IMEngineSignalGetSelection            m_signal_get_selection;
+    IMEngineSignalSetSelection            m_signal_set_selection;
+
     IMEngineSignalVoid                    m_signal_expand_candidate;
     IMEngineSignalVoid                    m_signal_contract_candidate;
 
@@ -585,6 +594,18 @@ IMEngineInstanceBase::signal_connect_delete_surrounding_text (IMEngineSlotDelete
 }
 
 Connection
+IMEngineInstanceBase::signal_connect_get_selection (IMEngineSlotGetSelection *slot)
+{
+    return m_impl->m_signal_get_selection.connect (slot);
+}
+
+Connection
+IMEngineInstanceBase::signal_connect_set_selection (IMEngineSlotSetSelection *slot)
+{
+    return m_impl->m_signal_set_selection.connect (slot);
+}
+
+Connection
 IMEngineInstanceBase::signal_connect_expand_candidate (IMEngineSlotVoid *slot)
 {
     return m_impl->m_signal_expand_candidate.connect (slot);
@@ -741,6 +762,21 @@ IMEngineInstanceBase::delete_surrounding_text (int offset, int len)
     return m_impl->m_signal_delete_surrounding_text (this, offset, len);
 }
 
+bool
+IMEngineInstanceBase::get_selection (WideString &text)
+{
+    if (m_impl->m_signal_get_selection (this, text))
+        return true;
+
+    return false;
+}
+
+bool
+IMEngineInstanceBase::set_selection (int start, int end)
+{
+    return m_impl->m_signal_set_selection (this, start, end);
+}
+
 void
 IMEngineInstanceBase::expand_candidate (void)
 {
index 97e5982..abc3879 100644 (file)
@@ -155,6 +155,12 @@ typedef Slot5<bool, IMEngineInstanceBase*,WideString&,int&,int,int>
 typedef Slot3<bool, IMEngineInstanceBase*,int,int>
         IMEngineSlotDeleteSurroundingText;
 
+typedef Slot2<bool, IMEngineInstanceBase*,WideString&>
+        IMEngineSlotGetSelection;
+
+typedef Slot3<bool, IMEngineInstanceBase*,int,int>
+        IMEngineSlotSetSelection;
+
 typedef Slot3<void, IMEngineInstanceBase*,ISF_CANDIDATE_PORTRAIT_LINE_T,ISF_CANDIDATE_MODE_T>
         IMEngineSlotCandidateStyle;
 
@@ -508,6 +514,9 @@ public:
     Connection signal_connect_get_surrounding_text    (IMEngineSlotGetSurroundingText *slot);
     Connection signal_connect_delete_surrounding_text (IMEngineSlotDeleteSurroundingText *slot);
 
+    Connection signal_connect_get_selection           (IMEngineSlotGetSelection *slot);
+    Connection signal_connect_set_selection           (IMEngineSlotSetSelection *slot);
+
     Connection signal_connect_expand_candidate        (IMEngineSlotVoid *slot);
     Connection signal_connect_contract_candidate      (IMEngineSlotVoid *slot);
 
@@ -928,6 +937,25 @@ protected:
     bool delete_surrounding_text (int offset, int len);
 
     /**
+     * @brief Retrieves selection.
+     *
+     * @param text          location to store the string selected.
+     *
+     * @return true if selection was provided.
+     */
+    bool get_selection (WideString &text);
+
+    /**
+     * @brief Ask the client to select characters from the start to the end position.
+     *
+     * @param start start position in chars;
+     * @param end end position in chars.
+     *
+     * @return true if the signal was handled.
+     */
+    bool set_selection (int start, int end);
+
+    /**
      * @brief Request to expand candidate window.
      */
     void expand_candidate (void);
index 452c6d9..b468252 100644 (file)
@@ -144,6 +144,9 @@ public:
      */
     IMEngineFactoryPointer create_factory (unsigned int engine) const;
 
+    /**
+     * @brief Get a name of currently IMEngine modules.
+     */
     String get_module_name () const;
 };
 
index eb07f01..937a2d7 100644 (file)
@@ -396,22 +396,22 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
   { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
   { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
-/*  0x08a1                               leftradical ? ??? */
-/*  0x08a2                            topleftradical ? ??? */
-/*  0x08a3                            horizconnector ? ??? */
+  { 0x08a1, 0x23b7 }, /*  0x08a1                               leftradical ? ??? */
+  { 0x08a2, 0x250c }, /*  0x08a2                            topleftradical ? ??? */
+  { 0x08a3, 0x2500 }, /*  0x08a3                            horizconnector ? ??? */
   { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
   { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
   { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
-/*  0x08a7                          topleftsqbracket ? ??? */
-/*  0x08a8                          botleftsqbracket ? ??? */
-/*  0x08a9                         toprightsqbracket ? ??? */
-/*  0x08aa                         botrightsqbracket ? ??? */
-/*  0x08ab                             topleftparens ? ??? */
-/*  0x08ac                             botleftparens ? ??? */
-/*  0x08ad                            toprightparens ? ??? */
-/*  0x08ae                            botrightparens ? ??? */
-/*  0x08af                      leftmiddlecurlybrace ? ??? */
-/*  0x08b0                     rightmiddlecurlybrace ? ??? */
+  { 0x08a7, 0x23a1 }, /*  0x08a7                          topleftsqbracket ? ??? */
+  { 0x08a8, 0x23a3 }, /*  0x08a8                          botleftsqbracket ? ??? */
+  { 0x08a9, 0x23a4 }, /*  0x08a9                         toprightsqbracket ? ??? */
+  { 0x08aa, 0x23a6 }, /*  0x08aa                         botrightsqbracket ? ??? */
+  { 0x08ab, 0x239b }, /*  0x08ab                             topleftparens ? ??? */
+  { 0x08ac, 0x239d }, /*  0x08ac                             botleftparens ? ??? */
+  { 0x08ad, 0x239e }, /*  0x08ad                            toprightparens ? ??? */
+  { 0x08ae, 0x23a0 }, /*  0x08ae                            botrightparens ? ??? */
+  { 0x08af, 0x23a8 }, /*  0x08af                      leftmiddlecurlybrace ? ??? */
+  { 0x08b0, 0x23ac }, /*  0x08b0                     rightmiddlecurlybrace ? ??? */
 /*  0x08b1                          topleftsummation ? ??? */
 /*  0x08b2                          botleftsummation ? ??? */
 /*  0x08b3                 topvertsummationconnector ? ??? */
@@ -428,7 +428,7 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
   { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
   { 0x08c8, 0x2245 }, /*                 approximate ≅ APPROXIMATELY EQUAL TO */
-/*  0x08c9                              similarequal ? ??? */
+  { 0x08c9, 0x2243 }, /*  0x08c9                              similarequal ? ??? */
   { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
   { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
   { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
@@ -459,11 +459,11 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
   { 0x09ed, 0x2514 }, /*               lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
   { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-/*  0x09ef                            horizlinescan1 ? ??? */
-/*  0x09f0                            horizlinescan3 ? ??? */
+  { 0x09ef, 0x23ba }, /*  0x09ef                            horizlinescan1 ? ??? */
+  { 0x09f0, 0x23bb }, /*  0x09f0                            horizlinescan3 ? ??? */
   { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
-/*  0x09f2                            horizlinescan7 ? ??? */
-/*  0x09f3                            horizlinescan9 ? ??? */
+  { 0x09f2, 0x23bc }, /*  0x09f2                            horizlinescan7 ? ??? */
+  { 0x09f3, 0x23bd }, /*  0x09f3                            horizlinescan9 ? ??? */
   { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
   { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
   { 0x09f6, 0x2534 }, /*                        bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
@@ -479,9 +479,9 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
   { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
   { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
-/*  0x0aac                               signifblank ? ??? */
+  { 0x0aac, 0x2423 }, /*  0x0aac                               signifblank ? ??? */
   { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-/*  0x0aaf                           doubbaselinedot ? ??? */
+  { 0x0aaf, 0x2025 }, /*  0x0aaf                           doubbaselinedot ? ??? */
   { 0x0ab0, 0x2153 }, /*                    onethird ⅓ VULGAR FRACTION ONE THIRD */
   { 0x0ab1, 0x2154 }, /*                   twothirds ⅔ VULGAR FRACTION TWO THIRDS */
   { 0x0ab2, 0x2155 }, /*                    onefifth ⅕ VULGAR FRACTION ONE FIFTH */
@@ -765,15 +765,41 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
   { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
   { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
-/*  0x0ef3                  Hangul_KkogjiDalrinIeung ? ??? */
+  { 0x0ef3, 0x3181 }, /*  0x0ef3                  Hangul_KkogjiDalrinIeung ? ??? */
   { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
   { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
   { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
   { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
   { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-/*  0x0ef9                Hangul_J_KkogjiDalrinIeung ? ??? */
+  { 0x0ef3, 0x11f0 }, /*  0x0ef9                Hangul_J_KkogjiDalrinIeung ? ??? */
   { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
   { 0x0eff, 0x20a9 }, /*                  Korean_Won ₩ WON SIGN */
+  { 0x12a1, 0x1e02 }, /* Babovedot */
+  { 0x12a2, 0x1e03 }, /* babovedot */
+  { 0x12a6, 0x1e0a }, /* Dabovedot */
+  { 0x12a8, 0x1e80 }, /* Wgrave */
+  { 0x12aa, 0x1e82 }, /* Wacute */
+  { 0x12ab, 0x1e0b }, /* dabovedot */
+  { 0x12ac, 0x1ef2 }, /* Ygrave */
+  { 0x12b0, 0x1e1e }, /* Fabovedot */
+  { 0x12b1, 0x1e1f }, /* fabovedot */
+  { 0x12b4, 0x1e40 }, /* Mabovedot */
+  { 0x12b5, 0x1e41 }, /* mabovedot */
+  { 0x12b7, 0x1e56 }, /* Pabovedot */
+  { 0x12b8, 0x1e81 }, /* wgrave */
+  { 0x12b9, 0x1e57 }, /* pabovedot */
+  { 0x12ba, 0x1e83 }, /* wacute */
+  { 0x12bb, 0x1e60 }, /* Sabovedot */
+  { 0x12bc, 0x1ef3 }, /* ygrave */
+  { 0x12bd, 0x1e84 }, /* Wdiaeresis */
+  { 0x12be, 0x1e85 }, /* wdiaeresis */
+  { 0x12bf, 0x1e61 }, /* sabovedot */
+  { 0x12d0, 0x0174 }, /* Wcircumflex */
+  { 0x12d7, 0x1e6a }, /* Tabovedot */
+  { 0x12de, 0x0176 }, /* Ycircumflex */
+  { 0x12f0, 0x0175 }, /* wcircumflex */
+  { 0x12f7, 0x1e6b }, /* tabovedot */
+  { 0x12fe, 0x0177 }, /* ycircumflex */
   { 0x13bc, 0x0152 }, /*                          OE Œ LATIN CAPITAL LIGATURE OE */
   { 0x13bd, 0x0153 }, /*                          oe œ LATIN SMALL LIGATURE OE */
   { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
@@ -792,6 +818,25 @@ static __Uint16Pair __scim_key_to_unicode_tab [] = {
   { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
 
   /* Following items added to SCIM, not in the xterm table */
+  { 0xfe50, 0x0300 }, /* dead_grave */
+  { 0xfe51, 0x0301 }, /* dead_acute */
+  { 0xfe52, 0x0302 }, /* dead_circumflex */
+  { 0xfe53, 0x0303 }, /* dead_tilde */
+  { 0xfe54, 0x0304 }, /* dead_macron */
+  { 0xfe55, 0x0306 }, /* dead_breve */
+  { 0xfe56, 0x0307 }, /* dead_abovedot */
+  { 0xfe57, 0x0308 }, /* dead_diaeresis */
+  { 0xfe58, 0x030a }, /* dead_abovering */
+  { 0xfe59, 0x030b }, /* dead_doubleacute */
+  { 0xfe5a, 0x030c }, /* dead_caron */
+  { 0xfe5b, 0x0327 }, /* dead_cedilla */
+  { 0xfe5c, 0x0328 }, /* dead_ogonek */
+  { 0xfe5d, 0x0345 }, /* dead_iota */
+  { 0xfe5e, 0x3099 }, /* dead_voiced_sound */
+  { 0xfe5f, 0x309a }, /* dead_semivoiced_sound */
+  { 0xfe60, 0x0323 }, /* dead_belowdot */
+  { 0xfe61, 0x0309 }, /* dead_hook */
+  { 0xfe62, 0x031b }, /* dead_horn */
 
   /* Function keys */
   { 0xFF09, 0x0009 },
@@ -1820,6 +1865,34 @@ static __KeyName __scim_keys_by_code [] = {
   { 0x0ef9, "Hangul_J_KkogjiDalrinIeung" },
   { 0x0efa, "Hangul_J_YeorinHieuh" },
   { 0x0eff, "Korean_Won" },
+
+  { 0x12a1, "Babovedot" },
+  { 0x12a2, "babovedot" },
+  { 0x12a6, "Dabovedot" },
+  { 0x12a8, "Wgrave" },
+  { 0x12aa, "Wacute" },
+  { 0x12ab, "dabovedot" },
+  { 0x12ac, "Ygrave" },
+  { 0x12b0, "Fabovedot" },
+  { 0x12b1, "fabovedot" },
+  { 0x12b4, "Mabovedot" },
+  { 0x12b5, "mabovedot" },
+  { 0x12b7, "Pabovedot" },
+  { 0x12b8, "wgrave" },
+  { 0x12b9, "pabovedot" },
+  { 0x12ba, "wacute" },
+  { 0x12bb, "Sabovedot" },
+  { 0x12bc, "ygrave" },
+  { 0x12bd, "Wdiaeresis" },
+  { 0x12be, "wdiaeresis" },
+  { 0x12bf, "sabovedot" },
+  { 0x12d0, "Wcircumflex" },
+  { 0x12d7, "Tabovedot" },
+  { 0x12de, "Ycircumflex" },
+  { 0x12f0, "wcircumflex" },
+  { 0x12f7, "tabovedot" },
+  { 0x12fe, "ycircumflex" },
+
   { 0x13bc, "OE" },
   { 0x13bd, "oe" },
   { 0x13be, "Ydiaeresis" },
@@ -2248,6 +2321,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x00C3, "Atilde" },
   { 0xFE7A, "AudibleBell_Enable" },
   { 0x0042, "B" },
+  { 0x12a1, "Babovedot" },
   { 0xFF08, "BackSpace" },
   { 0xFF58, "Begin" },
   { 0xFE74, "BounceKeys_Enable" },
@@ -2343,6 +2417,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x06DA, "Cyrillic_ze" },
   { 0x06D6, "Cyrillic_zhe" },
   { 0x0044, "D" },
+  { 0x12a6, "Dabovedot" },
   { 0x01CF, "Dcaron" },
   { 0xFFFF, "Delete" },
   { 0x20AB, "DongSign" },
@@ -2403,6 +2478,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0xFFC4, "F7" },
   { 0xFFC5, "F8" },
   { 0xFFC6, "F9" },
+  { 0x12B0, "Fabovedot" },
   { 0x20A3, "FFrancSign" },
   { 0xFF68, "Find" },
   { 0xFED0, "First_Virtual_Screen" },
@@ -2703,6 +2779,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x20A4, "LiraSign" },
   { 0x01A3, "Lstroke" },
   { 0x004D, "M" },
+  { 0x12B4, "Mabovedot" },
   { 0x06B5, "Macedonia_DSE" },
   { 0x06B2, "Macedonia_GJE" },
   { 0x06BC, "Macedonia_KJE" },
@@ -2744,6 +2821,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0xFE78, "Overlay1_Enable" },
   { 0xFE79, "Overlay2_Enable" },
   { 0x0050, "P" },
+  { 0x12B7, "Pabovedot" },
   { 0xFF56, "Page_Down" },
   { 0xFF55, "Page_Up" },
   { 0xFF13, "Pause" },
@@ -2794,6 +2872,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0xFF24, "Romaji" },
   { 0x20A8, "RupeeSign" },
   { 0x0053, "S" },
+  { 0x12BB, "Sabovedot" },
   { 0x01A6, "Sacute" },
   { 0x01A9, "Scaron" },
   { 0x01AA, "Scedilla" },
@@ -2824,6 +2903,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x0054, "T" },
   { 0x00DE, "THORN" },
   { 0xFF09, "Tab" },
+  { 0x12d7, "Tabovedot" },
   { 0x01AB, "Tcaron" },
   { 0x01DE, "Tcedilla" },
   { 0xFED5, "Terminate_Server" },
@@ -2942,11 +3022,17 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x03DD, "Utilde" },
   { 0x0056, "V" },
   { 0x0057, "W" },
+  { 0x12AA, "Wacute" },
+  { 0x12D0, "Wcircumflex" },
+  { 0x12BD, "Wdiaeresis" },
+  { 0x12A8, "Wgrave" },
   { 0x20A9, "WonSign" },
   { 0x0058, "X" },
   { 0x0059, "Y" },
   { 0x00DD, "Yacute" },
+  { 0x12DE, "Ycircumflex" },
   { 0x13BE, "Ydiaeresis" },
+  { 0x12AC, "Ygrave" },
   { 0x005A, "Z" },
   { 0x01AF, "Zabovedot" },
   { 0x01AC, "Zacute" },
@@ -2974,6 +3060,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x0040, "at" },
   { 0x00E3, "atilde" },
   { 0x0062, "b" },
+  { 0x12A2, "babovedot" },
   { 0x005C, "backslash" },
   { 0x0AF4, "ballotcross" },
   { 0x007C, "bar" },
@@ -3021,6 +3108,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x00A4, "currency" },
   { 0x0AFF, "cursor" },
   { 0x0064, "d" },
+  { 0x12AB, "dabovedot" },
   { 0x0AF1, "dagger" },
   { 0x01EF, "dcaron" },
   { 0xFE56, "dead_abovedot" },
@@ -3089,6 +3177,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x0021, "exclam" },
   { 0x00A1, "exclamdown" },
   { 0x0066, "f" },
+  { 0x12B1, "fabovedot" },
   { 0x0AF8, "femalesymbol" },
   { 0x09E3, "ff" },
   { 0x0ABB, "figdash" },
@@ -3280,6 +3369,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x09EA, "lowrightcorner" },
   { 0x01B3, "lstroke" },
   { 0x006D, "m" },
+  { 0x12B5, "mabovedot" },
   { 0x00AF, "macron" },
   { 0x0AF7, "malesymbol" },
   { 0x0AF0, "maltesecross" },
@@ -3330,6 +3420,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x0BC0, "overbar" },
   { 0x047E, "overline" },
   { 0x0070, "p" },
+  { 0x12B9, "pabovedot" },
   { 0x00B6, "paragraph" },
   { 0x0028, "parenleft" },
   { 0x0029, "parenright" },
@@ -3369,6 +3460,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x09F5, "rightt" },
   { 0x0BFC, "righttack" },
   { 0x0073, "s" },
+  { 0x12BF, "sabovedot" },
   { 0x01B6, "sacute" },
   { 0x01B9, "scaron" },
   { 0x01BA, "scedilla" },
@@ -3389,6 +3481,7 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x00DF, "ssharp" },
   { 0x00A3, "sterling" },
   { 0x0074, "t" },
+  { 0x12F7, "tabovedot" },
   { 0x01BB, "tcaron" },
   { 0x01FE, "tcedilla" },
   { 0x0AF9, "telephone" },
@@ -3445,11 +3538,17 @@ static __KeyName __scim_keys_by_name [] = {
   { 0x04DE, "voicedsound" },
   { 0x09E9, "vt" },
   { 0x0077, "w" },
+  { 0x12BA, "wacute" },
+  { 0x12F0, "wcircumflex" },
+  { 0x12BE, "wdiaeresis" },
+  { 0x12B8, "wgrave" },
   { 0x0078, "x" },
   { 0x0079, "y" },
   { 0x00FD, "yacute" },
+  { 0x12FE, "ycircumflex" },
   { 0x00FF, "ydiaeresis" },
   { 0x00A5, "yen" },
+  { 0x12BC, "ygrave" },
   { 0x007A, "z" },
   { 0x01BF, "zabovedot" },
   { 0x01BC, "zacute" },
index 6c2e405..4e50f91 100644 (file)
@@ -95,6 +95,13 @@ int main (int argc, char *argv [])
 
     new_argv [new_argc ++] = argv [0];
 
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s\n",
+        time (0), getpid (), getppid (), __FILE__, __func__);
+    isf_save_log (buf);
+
+    set_app_privilege ("isf", NULL, NULL);
+
     while (i < argc) {
         if (++i >= argc) break;
 
@@ -271,8 +278,16 @@ int main (int argc, char *argv [])
         /* reset backend pointer, in order to destroy backend automatically. */
         backend.reset ();
 
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s, now running frontend...\n",
+            time (0), getpid (), getppid (), __FILE__, __func__);
+        isf_save_log (buf);
+
         frontend_module->run ();
     } catch (const std::exception & err) {
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s, caught an exception! : %s\n",
+            time (0), getpid (), getppid (), __FILE__, __func__, err.what());
+        isf_save_log (buf);
+
         std::cerr << err.what () << "\n";
         return 1;
     }
index 461b1ae..0888f59 100644 (file)
@@ -65,6 +65,7 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
+#include "security-server.h"
 
 
 EAPI scim::CommonLookupTable g_isf_candidate_table;
@@ -153,8 +154,8 @@ typedef Signal1<void, const KeyEvent &>
 typedef Signal1<void, struct rectinfo &>
         PanelAgentSignalRect;
 
-typedef Signal5<bool, String, String &, String &, int &, int &>
-        PanelAgentSignalBoolString3int2;
+typedef Signal6<bool, String, String &, String &, int &, int &, String &>
+        PanelAgentSignalBoolString4int2;
 
 enum ClientType {
     UNKNOWN_CLIENT,
@@ -249,6 +250,7 @@ class PanelAgent::PanelAgentImpl
     uint32                              m_current_client_context;
     String                              m_current_context_uuid;
     TOOLBAR_MODE_T                      m_current_toolbar_mode;
+    uint32                              m_current_helper_option;
     String                              m_current_helper_uuid;
     String                              m_last_helper_uuid;
     String                              m_current_ise_name;
@@ -266,6 +268,9 @@ class PanelAgent::PanelAgentImpl
     uint32                              m_last_client_context;
     String                              m_last_context_uuid;
 
+    char                               *m_ise_context_buffer;
+    size_t                              m_ise_context_length;
+
     ClientRepository                    m_client_repository;
     /*
     * Each Helper ISE has two socket connect between PanelAgent and HelperAgent.
@@ -336,7 +341,7 @@ class PanelAgent::PanelAgentImpl
     PanelAgentSignalVoid                m_signal_contract_candidate;
     PanelAgentSignalInt                 m_signal_select_candidate;
     PanelAgentSignalBoolStringVector    m_signal_get_ise_list;
-    PanelAgentSignalBoolString3int2     m_signal_get_ise_information;
+    PanelAgentSignalBoolString4int2     m_signal_get_ise_information;
     PanelAgentSignalBoolStringVector    m_signal_get_keyboard_ise_list;
     PanelAgentSignalIntIntIntInt        m_signal_update_ise_geometry;
     PanelAgentSignalStringVector        m_signal_get_language_list;
@@ -373,11 +378,13 @@ public:
           m_socket_timeout (scim_get_default_socket_timeout ()),
           m_current_socket_client (-1), m_current_client_context (0),
           m_current_toolbar_mode (TOOLBAR_KEYBOARD_MODE),
+          m_current_helper_option (0),
           m_pending_active_imcontrol_id (-1),
           m_active_client_id (-1),
           m_should_shared_ise (false),
           m_ise_exiting (false), m_is_imengine_aux (false), m_is_imengine_candidate (false),
-          m_last_socket_client (-1), m_last_client_context (0)
+          m_last_socket_client (-1), m_last_client_context (0),
+          m_ise_context_buffer (NULL), m_ise_context_length (0)
     {
         m_current_ise_name = String (_("English Keyboard"));
         m_imcontrol_repository.clear ();
@@ -388,6 +395,20 @@ public:
         m_socket_server.signal_connect_exception (slot (this, &PanelAgentImpl::socket_exception_callback));
     }
 
+    ~PanelAgentImpl ()
+    {
+        delete_ise_context_buffer ();
+    }
+
+    void delete_ise_context_buffer (void)
+    {
+        if (m_ise_context_buffer != NULL) {
+            delete[] m_ise_context_buffer;
+            m_ise_context_buffer = NULL;
+            m_ise_context_length = 0;
+        }
+    }
+
     bool initialize (const String &config, const String &display, bool resident)
     {
         m_config_name = config;
@@ -398,6 +419,12 @@ public:
 
         m_socket_server.shutdown ();
 
+        /* If our helper manager could not connect to the HelperManager process,
+           this panel agent's initialization has failed - since we are assuming
+           the helper manager process should be launched beforehand */
+        if (m_helper_manager.get_connection_number() == -1)
+            return false;
+
         return m_socket_server.create (SocketAddress (m_socket_address));
     }
 
@@ -428,7 +455,7 @@ public:
             client.close ();
         }
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             String helper_uuid = get_current_helper_uuid ();
             hide_helper (helper_uuid);
             stop_helper (helper_uuid, -2, 0);
@@ -492,6 +519,11 @@ public:
         return String ("");
     }
 
+    uint32 get_current_helper_option () const
+    {
+        return m_current_helper_option;
+    }
+
     void set_current_ise_name (String &name)
     {
         m_current_ise_name = name;
@@ -502,6 +534,11 @@ public:
         m_current_toolbar_mode = mode;
     }
 
+    void set_current_helper_option (uint32 option)
+    {
+        m_current_helper_option = option;
+    }
+
     void update_panel_event (int cmd, uint32 nType, uint32 nValue)
     {
         int    focused_client;
@@ -703,7 +740,7 @@ public:
 
         get_focused_context (client, context);
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -733,7 +770,7 @@ public:
 
         get_focused_context (client, context);
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -773,7 +810,7 @@ public:
                 return true;
             }
         } else {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
                 HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
                 if (it != m_helper_client_index.end ()) {
@@ -814,7 +851,7 @@ public:
                 return true;
             }
         } else {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
                 HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
                 if (it != m_helper_client_index.end ()) {
@@ -843,7 +880,7 @@ public:
         int    client;
         uint32 context;
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -1292,14 +1329,13 @@ public:
         return true;
     }
 
-    bool stop_helper (const String &helper_uuid, int client, uint32 context)
+    bool stop_helper (const String &uuid, int client, uint32 context)
     {
         char buf[256] = {0};
         snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to stop ISE(%s)\n",
-            time (0), getpid (), __FILE__, __func__, helper_uuid.c_str ());
+            time (0), getpid (), __FILE__, __func__, uuid.c_str ());
         isf_save_log (buf);
 
-        String uuid = helper_uuid;
         SCIM_DEBUG_MAIN(1) << "PanelAgent::stop_helper (" << uuid << ")\n";
         if (uuid.length () <= 0)
             return false;
@@ -1685,8 +1721,8 @@ public:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::show_ise_panel ()\n";
         char buf[256] = {0};
-        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to show ISE\n",
-            time (0), getpid (), __FILE__, __func__);
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to show ISE %d\n",
+            time (0), getpid (), __FILE__, __func__, client_id);
         isf_save_log (buf);
 
         char   *data = NULL;
@@ -1713,6 +1749,15 @@ public:
                 uint32 ctx = get_helper_ic (focused_client, focused_context);
                 ret = show_helper (m_current_helper_uuid, data, len, ctx);
             }
+            /* Save ISE context for ISE panel re-showing */
+            if (data && len > 0) {
+                delete_ise_context_buffer ();
+                m_ise_context_buffer = new char [len];
+                if (m_ise_context_buffer) {
+                    m_ise_context_length = len;
+                    memcpy (m_ise_context_buffer, data, m_ise_context_length);
+                }
+            }
         }
 
         trans.clear ();
@@ -1723,26 +1768,27 @@ public:
         if (data != NULL)
             delete[] data;
 
-        m_signal_show_ise ();
+        if (ret) {
+            m_signal_show_ise ();
+        }
     }
 
     void hide_ise_panel (int client_id)
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::hide_ise_panel ()\n";
         char buf[256] = {0};
-        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to hide ISE\n",
-            time (0), getpid (), __FILE__, __func__);
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to hide ISE, %d %d\n",
+            time (0), getpid (), __FILE__, __func__, client_id, m_show_request_client_id);
         isf_save_log (buf);
 
-        TOOLBAR_MODE_T mode;
-
-        mode = m_current_toolbar_mode;
+        bool ret = false;
 
         uint32 client;
         uint32 context;
         if (m_recv_trans.get_data (client) && m_recv_trans.get_data (context)) {
             SCIM_DEBUG_MAIN(4) << __func__ << " (client:" << client << " context:" << context << ")\n";
-            if ((m_panel_client_map[client_id] == m_current_socket_client || client_id == m_show_request_client_id) && TOOLBAR_HELPER_MODE == mode) {
+            if ((m_panel_client_map[client_id] == m_current_socket_client || client_id == m_show_request_client_id)
+                && (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)) {
                 int    focused_client;
                 uint32 focused_context;
                 get_focused_context (focused_client, focused_context);
@@ -1753,10 +1799,16 @@ public:
 
                 uint32 ctx = get_helper_ic (focused_client, focused_context);
                 hide_helper (m_current_helper_uuid, ctx);
+
+                ret = true;
             }
+            /* Release ISE context buffer */
+            delete_ise_context_buffer ();
         }
 
-        m_signal_hide_ise ();
+        if (ret) {
+            m_signal_hide_ise ();
+        }
     }
 
     void set_default_ise (const DEFAULT_ISE_T &ise)
@@ -1770,6 +1822,40 @@ public:
         m_should_shared_ise = should_shared_ise;
     }
 
+    bool process_key_event (const String &uuid, KeyEvent& key, uint32 &result)
+    {
+        HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
+
+        if (it != m_helper_client_index.end ()) {
+            int    client;
+            uint32 context;
+            Socket client_socket (it->second.id);
+            uint32 ctx;
+            Transaction trans;
+
+            get_focused_context (client, context);
+            ctx = get_helper_ic (client, context);
+
+            trans.clear ();
+            trans.put_command (SCIM_TRANS_CMD_REPLY);
+            trans.put_data (ctx);
+            trans.put_data (uuid);
+            trans.put_command (SCIM_TRANS_CMD_PROCESS_KEY_EVENT);
+            trans.put_data (key);
+            int cmd;
+            if (trans.write_to_socket (client_socket)
+                && trans.read_from_socket (client_socket)
+                && trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY
+                && trans.get_data (result)) {
+                SCIM_DEBUG_MAIN (1) << __func__ << " success\n";
+                return true;
+            } else {
+                std::cerr << __func__ << " failed\n";
+            }
+        }
+        return false;
+    }
+
     bool get_helper_geometry (String &uuid, struct rectinfo &info)
     {
         HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
@@ -1834,7 +1920,7 @@ public:
             int cmd;
             if (trans.write_to_socket (client_socket)
                 && trans.read_from_socket (client_socket)
-                && trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY
+                && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY
                 && trans.get_data (imdata, len)) {
                 SCIM_DEBUG_MAIN (1) << "get_helper_imdata success\n";
                 return true;
@@ -1928,7 +2014,7 @@ public:
         bool    ret  = false;
         Transaction trans;
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -1976,10 +2062,9 @@ public:
     void get_current_ise_geometry (rectinfo &rect)
     {
         SCIM_DEBUG_MAIN(4) << __func__ << " \n";
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
         bool           ret  = false;
 
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             ret = get_helper_geometry (m_current_helper_uuid, rect);
 
         if (!ret) {
@@ -1996,7 +2081,7 @@ public:
         uint32 mode;
 
         if (m_recv_trans.get_data (mode)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_mode (m_current_helper_uuid, mode);
         }
     }
@@ -2007,7 +2092,7 @@ public:
         uint32 layout;
 
         if (m_recv_trans.get_data (layout)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_layout (m_current_helper_uuid, layout);
         }
     }
@@ -2018,7 +2103,7 @@ public:
         uint32 language;
 
         if (m_recv_trans.get_data (language)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_language (m_current_helper_uuid, language);
         }
     }
@@ -2030,7 +2115,7 @@ public:
         size_t  len;
 
         if (m_recv_trans.get_data (&imdata, len)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_imdata (m_current_helper_uuid, imdata, len);
         }
 
@@ -2045,9 +2130,7 @@ public:
         size_t  len;
         bool    ret    = false;
 
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
-
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             ret = get_helper_imdata (m_current_helper_uuid, &imdata, len);
 
         Transaction trans;
@@ -2074,9 +2157,7 @@ public:
         uint32 layout;
         bool   ret = false;
 
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
-
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             ret = get_helper_layout (m_current_helper_uuid, layout);
 
         Transaction trans;
@@ -2155,11 +2236,11 @@ public:
     {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
 
-        String strUuid, strName, strLanguage;
+        String strUuid, strName, strLanguage, strModuleName;
         int nType   = 0;
         int nOption = 0;
         if (m_recv_trans.get_data (strUuid)) {
-            m_signal_get_ise_information (strUuid, strName, strLanguage, nType, nOption);
+            m_signal_get_ise_information (strUuid, strName, strLanguage, nType, nOption, strModuleName);
         }
 
         Transaction trans;
@@ -2171,6 +2252,7 @@ public:
         trans.put_data (strLanguage);
         trans.put_data (nType);
         trans.put_data (nOption);
+        trans.put_data (strModuleName);
         trans.write_to_socket (client_socket);
     }
 
@@ -2394,13 +2476,45 @@ public:
             delete[] buf;
     }
 
+    void set_initial_ise_by_uuid (int client_id)
+    {
+        SCIM_DEBUG_MAIN(4) << "PanelAgent::set_initial_ise_by_uuid ()\n";
+        char   *buf = NULL;
+        size_t  len;
+        Transaction trans;
+        Socket client_socket (client_id);
+
+        trans.clear ();
+        trans.put_command (SCIM_TRANS_CMD_REPLY);
+        if (!(m_recv_trans.get_data (&buf, len))) {
+            trans.put_command (SCIM_TRANS_CMD_FAIL);
+            trans.write_to_socket (client_socket);
+            if (NULL != buf)
+                delete[] buf;
+            return;
+        }
+
+        if (buf == NULL) {
+            trans.put_command (SCIM_TRANS_CMD_FAIL);
+            trans.write_to_socket (client_socket);
+            return;
+        }
+
+        String uuid (buf);
+
+        scim_global_config_write (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String (uuid));
+
+        if (NULL != buf)
+            delete[] buf;
+    }
+
     void set_ise_return_key_type (int client_id)
     {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
         uint32 type;
 
         if (m_recv_trans.get_data (type)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_return_key_type (m_current_helper_uuid, type);
         }
     }
@@ -2411,9 +2525,7 @@ public:
         uint32 type = 0;
         bool   ret  = false;
 
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
-
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             ret = get_helper_return_key_type (m_current_helper_uuid, type);
 
         Transaction trans;
@@ -2437,7 +2549,7 @@ public:
         uint32 disabled;
 
         if (m_recv_trans.get_data (disabled)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_return_key_disable (m_current_helper_uuid, disabled);
         }
     }
@@ -2448,9 +2560,7 @@ public:
         uint32 disabled = 0;
         bool   ret      = false;
 
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
-
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             ret = get_helper_return_key_disable (m_current_helper_uuid, disabled);
 
         Transaction trans;
@@ -2515,9 +2625,8 @@ public:
     void reset_ise_context (int client_id)
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::reset_ise_context ()\n";
-        TOOLBAR_MODE_T mode = m_current_toolbar_mode;
 
-        if (TOOLBAR_HELPER_MODE == mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             reset_helper_context (m_current_helper_uuid);
     }
 
@@ -2526,7 +2635,7 @@ public:
         SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_caps_mode ()\n";
         uint32 mode;
         if (m_recv_trans.get_data (mode)) {
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                 set_helper_caps_mode (m_current_helper_uuid, mode);
         }
     }
@@ -2649,6 +2758,48 @@ public:
         m_signal_candidate_will_hide_ack ();
     }
 
+    void process_key_event (int client_id)
+    {
+        SCIM_DEBUG_MAIN(4) << __func__ << "\n";
+        uint32 result = 0;
+        bool   ret      = false;
+
+        KeyEvent key;
+        if (m_recv_trans.get_data (key)) {
+            ret = process_key_event (m_current_helper_uuid, key, result);
+        }
+
+        Transaction trans;
+        Socket client_socket (client_id);
+
+        trans.clear ();
+        trans.put_command (SCIM_TRANS_CMD_REPLY);
+        if (ret) {
+            trans.put_command (SCIM_TRANS_CMD_OK);
+            trans.put_data (result);
+        } else {
+            trans.put_command (SCIM_TRANS_CMD_FAIL);
+        }
+
+        trans.write_to_socket (client_socket);
+    }
+
+    void get_active_helper_option (int client_id)
+    {
+        SCIM_DEBUG_MAIN(4) << __func__ << "\n";
+        uint32 option = get_current_helper_option ();
+
+        Transaction trans;
+        Socket client_socket (client_id);
+
+        trans.clear ();
+        trans.put_command (SCIM_TRANS_CMD_REPLY);
+        trans.put_command (SCIM_TRANS_CMD_OK);
+        trans.put_data (option);
+        SCIM_DEBUG_MAIN(4) << __func__ << " option " << option << "\n";
+        trans.write_to_socket (client_socket);
+    }
+
     Connection signal_connect_reload_config              (PanelAgentSlotVoid                *slot)
     {
         return m_signal_reload_config.connect (slot);
@@ -2869,7 +3020,7 @@ public:
         return m_signal_get_ise_list.connect (slot);
     }
 
-    Connection signal_connect_get_ise_information        (PanelAgentSlotBoolString3int2        *slot)
+    Connection signal_connect_get_ise_information        (PanelAgentSlotBoolString4int2        *slot)
     {
         return m_signal_get_ise_information.connect (slot);
     }
@@ -3068,7 +3219,7 @@ private:
                     if (cmd == ISM_TRANS_CMD_REGISTER_PANEL_CLIENT) {
                         uint32 id = 0;
                         if (m_recv_trans.get_data (id)) {
-                            SCIM_DEBUG_MAIN(4) << "    ISM_TRANS_CMD_REGISTER_PANEL_CLIENT (" << client_id << "," << "," << context << "," << id << ")\n";
+                            SCIM_DEBUG_MAIN(4) << "    ISM_TRANS_CMD_REGISTER_PANEL_CLIENT (" << client_id << "," << context << "," << id << ")\n";
                             m_panel_client_map [client_id] = (int)id;
                         }
                         continue;
@@ -3076,7 +3227,7 @@ private:
 
                     if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_INPUT_CONTEXT) {
                         if (m_recv_trans.get_data (uuid)) {
-                            SCIM_DEBUG_MAIN (2) << "PanelAgent::register_input_context (" << client_id << "," << "," << context << "," << uuid << ")\n";
+                            SCIM_DEBUG_MAIN (2) << "PanelAgent::register_input_context (" << client_id << "," << context << "," << uuid << ")\n";
                             uint32 ctx = get_helper_ic (m_panel_client_map[client_id], context);
                             m_client_context_uuids [ctx] = uuid;
                         }
@@ -3121,7 +3272,7 @@ private:
                         m_signal_focus_in ();
                         focus_in_helper (m_current_helper_uuid, m_panel_client_map[client_id], context);
                         if (m_recv_trans.get_data (uuid)) {
-                            SCIM_DEBUG_MAIN (2) << "PanelAgent::focus_in (" << client_id << "," << "," << context << "," << uuid << ")\n";
+                            SCIM_DEBUG_MAIN (2) << "PanelAgent::focus_in (" << client_id << "," << context << "," << uuid << ")\n";
                             m_active_client_id = client_id;
                             lock ();
                             if (m_current_socket_client >= 0) {
@@ -3205,6 +3356,12 @@ private:
                     } else if (cmd == ISM_TRANS_CMD_SEND_CANDIDATE_WILL_HIDE_ACK) {
                         candidate_will_hide_ack (client_id);
                         continue;
+                    } else if (cmd == SCIM_TRANS_CMD_PROCESS_KEY_EVENT) {
+                        process_key_event (client_id);
+                        continue;
+                    } else if (cmd == ISM_TRANS_CMD_GET_ACTIVE_HELPER_OPTION) {
+                        get_active_helper_option (client_id);
+                        continue;
                     } else if (cmd == ISM_TRANS_CMD_GET_ISE_STATE) {
                         get_ise_state (client_id);
                         continue;
@@ -3268,6 +3425,8 @@ private:
                         socket_update_cursor_position ();
                     else if (cmd == ISM_TRANS_CMD_UPDATE_SURROUNDING_TEXT)
                         socket_update_surrounding_text ();
+                    else if (cmd == ISM_TRANS_CMD_UPDATE_SELECTION)
+                        socket_update_selection ();
                     else if (cmd == ISM_TRANS_CMD_EXPAND_CANDIDATE)
                         m_signal_expand_candidate ();
                     else if (cmd == ISM_TRANS_CMD_CONTRACT_CANDIDATE)
@@ -3402,6 +3561,29 @@ private:
                     socket_helper_send_imengine_event (client_id);
                 } else if (cmd == SCIM_TRANS_CMD_REGISTER_PROPERTIES) {
                     socket_helper_register_properties (client_id);
+
+                    /* Check whether application is already focus_in */
+                    if (m_current_socket_client != -1) {
+                        SCIM_DEBUG_MAIN (2) << "Application is already focus_in!\n";
+                        focus_in_helper (m_current_helper_uuid, m_current_socket_client, m_current_client_context);
+                        reset_keyboard_ise ();
+                    }
+                    /* Check whether ISE panel is already shown */
+                    if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode && m_ise_context_length > 0) {
+                        SCIM_DEBUG_MAIN (2) << "Re-show ISE panel!\n";
+                        int    focused_client;
+                        uint32 focused_context;
+                        get_focused_context (focused_client, focused_context);
+                        if (focused_client == -1 && m_active_client_id != -1) {
+                            focused_client  = m_panel_client_map[m_active_client_id];
+                            focused_context = 0;
+                        }
+
+                        uint32 ctx = get_helper_ic (focused_client, focused_context);
+                        bool ret = show_helper (m_current_helper_uuid, m_ise_context_buffer, m_ise_context_length, ctx);
+                        if (ret)
+                            m_signal_show_ise ();
+                    }
                 } else if (cmd == SCIM_TRANS_CMD_UPDATE_PROPERTY) {
                     socket_helper_update_property (client_id);
                 } else if (cmd == SCIM_TRANS_CMD_RELOAD_CONFIG) {
@@ -3439,6 +3621,10 @@ private:
                     socket_helper_get_surrounding_text (client_id);
                 } else if (cmd == SCIM_TRANS_CMD_DELETE_SURROUNDING_TEXT) {
                     socket_helper_delete_surrounding_text (client_id);
+                } else if (cmd == SCIM_TRANS_CMD_GET_SELECTION) {
+                    socket_helper_get_selection (client_id);
+                } else if (cmd == SCIM_TRANS_CMD_SET_SELECTION) {
+                    socket_helper_set_selection (client_id);
                 } else if (cmd == ISM_TRANS_CMD_UPDATE_ISE_EXIT) {
                     HelperInfoRepository::iterator hiit = m_helper_active_info_repository.find (client.get_id ());
                     if (hiit != m_helper_active_info_repository.end ()) {
@@ -3460,8 +3646,37 @@ private:
                 if (cmd == ISM_TRANS_CMD_GET_ACTIVE_ISE)
                     get_active_ise (client_id);
                 else if (cmd == ISM_TRANS_CMD_SET_ACTIVE_ISE_BY_UUID) {
+                    char buf[256] = {0};
+                    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  checking sockfd privilege...\n",
+                        time (0), getpid (), __FILE__, __func__);
+                    isf_save_log (buf);
+                    int ret = security_server_check_privilege_by_sockfd (client_id, "isf::manager", "w");
+                    if (ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED) {
+                        SCIM_DEBUG_MAIN (2) <<"Security server api error. Access denied\n";
+                    } else {
+                        SCIM_DEBUG_MAIN (2) <<"Security server api success\n";
+                    }
+                    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  setting active ise\n",
+                        time (0), getpid (), __FILE__, __func__);
+                    isf_save_log (buf);
                     set_active_ise_by_uuid (client_id);
                 }
+                else if (cmd == ISM_TRANS_CMD_SET_INITIAL_ISE_BY_UUID) {
+                    char buf[256] = {0};
+                    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  checking sockfd privilege...\n",
+                        time (0), getpid (), __FILE__, __func__);
+                    isf_save_log (buf);
+                    int ret = security_server_check_privilege_by_sockfd (client_id, "isf::manager", "w");
+                    if (ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED) {
+                        SCIM_DEBUG_MAIN (2) <<"Security server api error. Access denied\n";
+                    } else {
+                        SCIM_DEBUG_MAIN (2) <<"Security server api success\n";
+                    }
+                    snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  setting initial ise\n",
+                        time (0), getpid (), __FILE__, __func__);
+                    isf_save_log (buf);
+                    set_initial_ise_by_uuid (client_id);
+                }
                 else if (cmd == ISM_TRANS_CMD_GET_ISE_LIST)
                     get_ise_list (client_id);
                 else if (cmd == ISM_TRANS_CMD_GET_ISE_INFORMATION)
@@ -3553,7 +3768,7 @@ private:
             SCIM_DEBUG_MAIN(4) << "It's a FrontEnd client.\n";
             /* The focused client is closed. */
             if (m_current_socket_client == client.get_id ()) {
-                if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+                if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
                     hide_helper (m_current_helper_uuid);
 
                 lock ();
@@ -3799,6 +4014,38 @@ private:
         }
     }
 
+    void socket_update_selection         (void)
+    {
+        SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n";
+
+        String text;
+        if (m_recv_trans.get_data (text)) {
+            HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
+
+            if (it != m_helper_client_index.end ()) {
+                int    client;
+                uint32 context;
+                Socket client_socket (it->second.id);
+                uint32 ctx;
+
+                lock ();
+
+                get_focused_context (client, context);
+                ctx = get_helper_ic (client, context);
+
+                m_send_trans.clear ();
+                m_send_trans.put_command (SCIM_TRANS_CMD_REPLY);
+                m_send_trans.put_data (ctx);
+                m_send_trans.put_data (m_current_helper_uuid);
+                m_send_trans.put_command (ISM_TRANS_CMD_UPDATE_SELECTION);
+                m_send_trans.put_data (text);
+                m_send_trans.write_to_socket (client_socket);
+
+                unlock ();
+            }
+        }
+    }
+
     void socket_update_factory_info             (void)
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_update_factory_info ()\n";
@@ -3857,12 +4104,7 @@ private:
 
             get_focused_context (focused_client, focused_context);
 
-            if (focused_client == -1) {
-                std::cerr << __func__ << " get_focused_context is failed!!!\n";
-                return;
-            }
-
-            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+            if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
                 HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
                 if (it != m_helper_client_index.end ()) {
@@ -3881,6 +4123,11 @@ private:
                 }
             }
 
+            if (focused_client == -1) {
+                std::cerr << __func__ << " get_focused_context is failed!!!\n";
+                return;
+            }
+
             ClientInfo client_info = socket_get_client_info (focused_client);
             if (client_info.type == FRONTEND_CLIENT) {
                 Socket socket_client (focused_client);
@@ -4585,6 +4832,61 @@ private:
         }
     }
 
+    void socket_helper_get_selection     (int client)
+    {
+        SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n";
+
+        String uuid;
+
+        if (m_recv_trans.get_data (uuid)) {
+
+            int     focused_client;
+            uint32  focused_context;
+            String  focused_uuid = get_focused_context (focused_client, focused_context);
+
+            ClientInfo client_info = socket_get_client_info (focused_client);
+            if (client_info.type == FRONTEND_CLIENT) {
+                Socket socket_client (focused_client);
+                lock ();
+                m_send_trans.clear ();
+                m_send_trans.put_command (SCIM_TRANS_CMD_REPLY);
+                m_send_trans.put_data (focused_context);
+                m_send_trans.put_command (SCIM_TRANS_CMD_GET_SELECTION);
+                m_send_trans.write_to_socket (socket_client);
+                unlock ();
+            }
+        }
+    }
+
+    void socket_helper_set_selection  (int client)
+    {
+        SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n";
+
+        uint32 start;
+        uint32 end;
+
+        if (m_recv_trans.get_data (start) && m_recv_trans.get_data (end)) {
+
+            int     focused_client;
+            uint32  focused_context;
+            String  focused_uuid = get_focused_context (focused_client, focused_context);
+
+            ClientInfo client_info = socket_get_client_info (focused_client);
+            if (client_info.type == FRONTEND_CLIENT) {
+                Socket socket_client (focused_client);
+                lock ();
+                m_send_trans.clear ();
+                m_send_trans.put_command (SCIM_TRANS_CMD_REPLY);
+                m_send_trans.put_data (focused_context);
+                m_send_trans.put_command (SCIM_TRANS_CMD_SET_SELECTION);
+                m_send_trans.put_data (start);
+                m_send_trans.put_data (end);
+                m_send_trans.write_to_socket (socket_client);
+                unlock ();
+            }
+        }
+    }
+
     void socket_helper_show_preedit_string            (int client)
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_helper_show_preedit_string (" << client << ")\n";
@@ -4913,7 +5215,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_reset_input_context \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode)
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)
             socket_reset_helper_input_context (m_current_helper_uuid, client, context);
     }
 
@@ -4921,7 +5223,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_select_aux \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -4952,7 +5254,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_select_candidate \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -4983,7 +5285,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_lookup_table_page_up \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5013,7 +5315,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_lookup_table_page_down \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5043,7 +5345,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_update_lookup_table_page_size \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5074,7 +5376,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5105,7 +5407,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_select_associate \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5136,7 +5438,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_associate_table_page_up \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5166,7 +5468,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_associate_table_page_down \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5196,7 +5498,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_update_associate_table_page_size \n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5227,7 +5529,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5258,7 +5560,7 @@ private:
     {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
 
-        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) {
+        if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode || m_current_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) {
             HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid);
 
             if (it != m_helper_client_index.end ()) {
@@ -5504,6 +5806,12 @@ PanelAgent::set_current_ise_name (String &name)
 }
 
 void
+PanelAgent::set_current_helper_option (uint32 option)
+{
+    m_impl->set_current_helper_option (option);
+}
+
+void
 PanelAgent::update_candidate_panel_event (uint32 nType, uint32 nValue)
 {
     m_impl->update_panel_event (ISM_TRANS_CMD_UPDATE_ISF_CANDIDATE_PANEL, nType, nValue);
@@ -6015,7 +6323,7 @@ PanelAgent::signal_connect_get_ise_list               (PanelAgentSlotBoolStringV
 }
 
 Connection
-PanelAgent::signal_connect_get_ise_information        (PanelAgentSlotBoolString3int2     *slot)
+PanelAgent::signal_connect_get_ise_information        (PanelAgentSlotBoolString4int2     *slot)
 {
     return m_impl->signal_connect_get_ise_information (slot);
 }
index 9b2ce04..7ad9921 100644 (file)
@@ -164,8 +164,8 @@ typedef Slot1<void, struct rectinfo &>
 typedef Slot2<void, const String &, bool>
         PanelAgentSlotStringBool;
 
-typedef Slot5<bool, String, String &, String &, int &, int &>
-        PanelAgentSlotBoolString3int2;
+typedef Slot6<bool, String, String &, String &, int &, int &, String &>
+        PanelAgentSlotBoolString4int2;
 
 typedef struct DefaultIse
 {
@@ -341,6 +341,12 @@ public:
     void set_current_toolbar_mode (TOOLBAR_MODE_T mode);
 
     /**
+     * @brief Set current helper ISE option.
+     *
+     * @param mode The current helper ISE option.
+     */
+    void set_current_helper_option (uint32 option);
+    /**
      * @brief Get current ISE size and position.
      *
      * @param rect It contains ISE size and position.
@@ -1007,7 +1013,7 @@ public:
      *
      * slot prototype: bool get_ise_information (String, String &, String &, int &, int &);
      */
-    Connection signal_connect_get_ise_information        (PanelAgentSlotBoolString3int2     *slot);
+    Connection signal_connect_get_ise_information        (PanelAgentSlotBoolString4int2     *slot);
 
     /**
      * @brief Signal: Get the list of selected language name.
index 2461f93..da4eb39 100644 (file)
@@ -123,6 +123,8 @@ class PanelClient::PanelClientImpl
     PanelClientSignalStringAttrsInt             m_signal_update_preedit_string;
     PanelClientSignalIntInt                     m_signal_get_surrounding_text;
     PanelClientSignalIntInt                     m_signal_delete_surrounding_text;
+    PanelClientSignalVoid                       m_signal_get_selection;
+    PanelClientSignalIntInt                     m_signal_set_selection;
     PanelClientSignalInt                        m_signal_update_displayed_candidate_number;
     PanelClientSignalVoid                       m_signal_candidate_more_window_show;
     PanelClientSignalVoid                       m_signal_candidate_more_window_hide;
@@ -157,18 +159,19 @@ public:
                 launch_panel (config, display);
                 std::cerr << " Re-connecting to PanelAgent server.";
                 ISF_LOG (" Re-connecting to PanelAgent server.\n");
-                for (i = 0; i < 200; ++i) {
+                /* Make sure we are not waiting for more than 10 seconds */
+                for (i = 0; i < 100; ++i) {
                     if (m_socket.connect (addr)) {
                         ret = true;
                         break;
                     }
                     std::cerr << ".";
-                    scim_usleep (200000);
+                    scim_usleep (100000);
+                }
+                if (ret) {
+                    std::cerr << " Connected :" << i << "\n";
+                    ISF_LOG ("  Connected :%d\n", i);
                 }
-                std::cerr << " Connected :" << i << "\n";
-                ISF_LOG ("  Connected :%d\n", i);
-                if (m_socket.connect (addr) == false && count >= 2)
-                    break;
             }
 
             if (ret && scim_socket_open_connection (m_socket_magic_key, String ("FrontEnd"), String ("Panel"), m_socket, m_socket_timeout)) {
@@ -190,9 +193,8 @@ public:
 
             m_socket.close ();
 
-            if (count++ >= 400) break;
-
-            scim_usleep (300000);
+            /* No need to do this forever... */
+            if (count++ >= 0) break;
         }
 
         return m_socket.get_id ();
@@ -431,6 +433,19 @@ public:
                             m_signal_delete_surrounding_text ((int) context, (int)offset, (int)len);
                     }
                     break;
+                 case SCIM_TRANS_CMD_GET_SELECTION:
+                    {
+                        m_signal_get_selection ((int) context);
+                    }
+                    break;
+                case SCIM_TRANS_CMD_SET_SELECTION:
+                    {
+                        uint32 start;
+                        uint32 end;
+                        if (recv.get_data (start) && recv.get_data (end))
+                            m_signal_set_selection ((int) context, (int)start, (int)end);
+                    }
+                    break;
                 case ISM_TRANS_CMD_UPDATE_DISPLAYED_CANDIDATE:
                     {
                         uint32 number;
@@ -604,6 +619,13 @@ public:
             m_send_trans.put_data ((uint32) cursor);
         }
     }
+    void update_selection (int icid, const WideString &str)
+    {
+        if (m_send_refcount > 0 && m_current_icid == icid) {
+            m_send_trans.put_command (ISM_TRANS_CMD_UPDATE_SELECTION);
+            m_send_trans.put_data (utf8_wcstombs (str));
+        }
+    }
     void show_preedit_string    (int icid)
     {
         if (m_send_refcount > 0 && m_current_icid == icid)
@@ -1114,6 +1136,50 @@ public:
         }
     }
 
+    void process_key_event(KeyEvent& key, int *ret) {
+        if (m_send_refcount > 0) {
+            int cmd;
+            uint32 ret_temp;
+
+            m_send_trans.put_command (SCIM_TRANS_CMD_PROCESS_KEY_EVENT);
+            m_send_trans.put_data(key);
+            instant_send ();
+            if (!m_send_trans.read_from_socket (m_socket_active, m_socket_timeout))
+                std::cerr << __func__ << " read_from_socket() may be timeout \n";
+
+            if (m_send_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY &&
+                    m_send_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK &&
+                    m_send_trans.get_data (ret_temp)) {
+                *ret = ret_temp;
+            } else {
+                std::cerr << __func__ << " get_command() or get_data() may fail!!!\n";
+            }
+            post_prepare ();
+        }
+    }
+
+    void get_active_helper_option(int *option) {
+        if (m_send_refcount > 0) {
+            int cmd;
+            uint32 option_temp;
+
+            m_send_trans.put_command (ISM_TRANS_CMD_GET_ACTIVE_HELPER_OPTION);
+            instant_send ();
+            if (!m_send_trans.read_from_socket (m_socket_active, m_socket_timeout))
+                std::cerr << __func__ << " read_from_socket() may be timeout \n";
+
+            if (m_send_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY &&
+                    m_send_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK &&
+                    m_send_trans.get_data (option_temp)) {
+                std::cerr << __func__ <<  "option_temp " << option_temp << "\n";
+                *option = option_temp;
+            } else {
+                std::cerr << __func__ << " get_command() or get_data() may fail!!!\n";
+            }
+            post_prepare ();
+        }
+    }
+
 public:
     void reset_signal_handler                               (void)
     {
@@ -1143,6 +1209,8 @@ public:
         m_signal_update_preedit_string.reset();
         m_signal_get_surrounding_text.reset();
         m_signal_delete_surrounding_text.reset();
+        m_signal_get_selection.reset();
+        m_signal_set_selection.reset();
         m_signal_update_displayed_candidate_number.reset();
         m_signal_candidate_more_window_show.reset();
         m_signal_candidate_more_window_hide.reset();
@@ -1263,6 +1331,16 @@ public:
         return m_signal_delete_surrounding_text.connect (slot);
     }
 
+    Connection signal_connect_get_selection                 (PanelClientSlotVoid                  *slot)
+    {
+        return m_signal_get_selection.connect (slot);
+    }
+
+    Connection signal_connect_set_selection                 (PanelClientSlotIntInt                  *slot)
+    {
+        return m_signal_set_selection.connect (slot);
+    }
+
     Connection signal_connect_update_displayed_candidate_number (PanelClientSlotInt                 *slot)
     {
         return m_signal_update_displayed_candidate_number.connect (slot);
@@ -1414,6 +1492,11 @@ PanelClient::update_surrounding_text (int icid, const WideString &str, int curso
     m_impl->update_surrounding_text (icid, str, cursor);
 }
 void
+PanelClient::update_selection (int icid, const WideString &str)
+{
+    m_impl->update_selection (icid, str);
+}
+void
 PanelClient::show_preedit_string    (int icid)
 {
     m_impl->show_preedit_string (icid);
@@ -1674,6 +1757,18 @@ PanelClient::get_ise_state (int &ise_state)
 }
 
 void
+PanelClient::process_key_event (KeyEvent& key, int* ret)
+{
+    m_impl->process_key_event (key, ret);
+}
+
+void
+PanelClient::get_active_helper_option(int* option)
+{
+    m_impl->get_active_helper_option (option);
+}
+
+void
 PanelClient::reset_signal_handler                         (void)
 {
     m_impl->reset_signal_handler ();
@@ -1818,6 +1913,18 @@ PanelClient::signal_connect_delete_surrounding_text       (PanelClientSlotIntInt
 }
 
 Connection
+PanelClient::signal_connect_get_selection                 (PanelClientSlotVoid                  *slot)
+{
+    return m_impl->signal_connect_get_selection (slot);
+}
+
+Connection
+PanelClient::signal_connect_set_selection                 (PanelClientSlotIntInt                  *slot)
+{
+    return m_impl->signal_connect_set_selection (slot);
+}
+
+Connection
 PanelClient::signal_connect_update_displayed_candidate_number (PanelClientSlotInt                 *slot)
 {
     return m_impl->signal_connect_update_displayed_candidate_number (slot);
index ce6afd1..9c62a59 100644 (file)
@@ -197,6 +197,7 @@ public:
     void update_spot_location   (int icid, int x, int y, int top_y);
     void update_cursor_position (int icid, int cursor_pos);
     void update_surrounding_text (int icid, const WideString &str, int cursor);
+    void update_selection       (int icid, const WideString &str);
     void show_preedit_string    (int icid);
     void show_aux_string        (int icid);
     void show_lookup_table      (int icid);
@@ -243,6 +244,8 @@ public:
     bool get_client_id          (int &client_id);
     void register_client        (int client_id);
     void get_ise_state          (int &ise_state);
+    void process_key_event      (KeyEvent& key, int* ret);
+    void get_active_helper_option (int* option);
 
     /** @} */
 
@@ -445,6 +448,20 @@ public:
     Connection signal_connect_delete_surrounding_text       (PanelClientSlotIntInt                  *slot);
 
     /**
+     * @brief Signal: request to get selection
+     *
+     * slot prototype: void get_selection (int context);
+     */
+    Connection signal_connect_get_selection                 (PanelClientSlotVoid                   *slot);
+
+    /**
+     * @brief Signal: set selection
+     *
+     * slot prototype: void set_selection (int context, int start, int end);
+     */
+    Connection signal_connect_set_selection                 (PanelClientSlotIntInt                  *slot);
+
+    /**
      * @brief Signal: update candidate item layout
      *
      * slot prototype: void update_candidate_item_layout (int context, const std::vector<uint32> &);
similarity index 96%
rename from ism/extras/efl_setting/include/scim_setup_module_efl.h
rename to ism/src/scim_setup_module_efl.h
index 5967911..888a892 100644 (file)
@@ -42,7 +42,7 @@ typedef bool (*SetupModuleQueryChangedFunc) (void);
 typedef bool (*SetupModuleKeyProceedingFunc) (int);
 typedef bool (*SetupModuleOptionResetFunc) (const ConfigPointer &config);
 
-class SetupModule
+class EAPI SetupModule
 {
     Module      m_module;
 
@@ -81,7 +81,7 @@ public:
     bool option_reset (const ConfigPointer &config) const;
 };
 
-int scim_get_setup_module_list (std::vector <String>& mod_list);
+EAPI int scim_get_setup_module_list (std::vector <String>& mod_list);
 
 #endif // __SCIM_SETUP_MODULE_EFL_H
 
index 753e103..8ec97b3 100644 (file)
@@ -54,6 +54,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <fcntl.h>
+#include <sys/prctl.h>
 
 #include "scim_private.h"
 #include "scim.h"
@@ -462,15 +463,19 @@ public:
             int flags = fcntl (m_id, F_GETFL, 0);
             if (fcntl (m_id, F_SETFL, flags | O_NONBLOCK) == -1) {
                 char buf[256] = {0};
-                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  ppid:%d  %s  %s  fcntl() failed, %d\n",
-                    time (0), getpid (), getppid (), __FILE__, __func__, errno);
+                m_err = errno;
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  ppid:%d  %s  %s  fcntl() failed, %d %s\n",
+                    time (0), getpid (), getppid (), __FILE__, __func__, m_err, strerror (m_err));
                 isf_save_log (buf);
             }
 
             char buf[256] = {0};
-            snprintf (buf, sizeof (buf), "time:%ld  pid:%d  ppid:%d  %s  %s  trying connect() to %s\n",
-                time (0), getpid (), getppid (), __FILE__, __func__, addr.get_address ().c_str ());
-            isf_save_log (buf);
+            char proc_name[17] = {0}; /* the buffer provided shall at least be 16+1 bytes long */
+            if (-1 != prctl(PR_GET_NAME, proc_name, 0, 0, 0)) {
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  ppid:%d  %s  %s  trying connect() to %s, %s\n",
+                    time (0), getpid (), getppid (), __FILE__, __func__, addr.get_address ().c_str (), proc_name);
+                isf_save_log (buf);
+            }
 
             if ((m_err = ::connect (m_id, data, len)) == 0) {
                 if (fcntl (m_id, F_SETFL, flags) == -1) {
@@ -521,8 +526,8 @@ public:
                 }
             } else {
                 m_err = errno;
-                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  connect() failed with %d\n",
-                        time (0), getpid (), __FILE__, __func__, errno);
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  connect() failed with %d (%s)\n",
+                        time (0), getpid (), __FILE__, __func__, m_err, strerror (m_err));
                 isf_save_log (buf);
             }
             if (fcntl (m_id, F_SETFL, flags) == -1) {
@@ -715,7 +720,13 @@ private:
                 gettimeofday (&cur_tv, 0);
                 elapsed = (cur_tv.tv_sec - begin_tv.tv_sec) * 1000 +
                           (cur_tv.tv_usec - begin_tv.tv_usec) / 1000;
-                *timeout = *timeout - elapsed;
+                /* If somebody else calls settimeofday () after we set begin_tv value,
+                   the elapsed time could be invalid */
+                if (elapsed < 0) {
+                    *timeout = 0;
+                } else {
+                    *timeout = *timeout - elapsed;
+                }
                 if (*timeout > 0) {
                     tv.tv_sec = *timeout / 1000;
                     tv.tv_usec = (*timeout % 1000) * 1000;
@@ -1484,11 +1495,22 @@ scim_socket_open_connection   (uint32       &key,
             if (trans.write_to_socket (socket))
                 return true;
         } else {
+            {
+                char buf[256] = {0};
+                snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  read_from_socket() failed %d\n",
+                    time (0), getpid (), __FILE__, __func__, timeout);
+                isf_save_log (buf);
+            }
             trans.clear ();
             trans.put_command (SCIM_TRANS_CMD_REPLY);
             trans.put_command (SCIM_TRANS_CMD_FAIL);
             trans.write_to_socket (socket);
         }
+    } else {
+        char buf[256] = {0};
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  write_to_socket() failed\n",
+            time (0), getpid (), __FILE__, __func__);
+        isf_save_log (buf);
     }
 
     return false;
index 34f3a1c..5ac7061 100644 (file)
@@ -529,6 +529,8 @@ const int ISM_TRANS_CMD_SHOW_ASSOCIATE_TABLE              = 170;
 const int ISM_TRANS_CMD_HIDE_ASSOCIATE_TABLE              = 171;
 const int ISM_TRANS_CMD_UPDATE_ASSOCIATE_TABLE            = 172;
 const int ISM_TRANS_CMD_TRANSACTION_CONTINUE              = 173;
+const int SCIM_TRANS_CMD_GET_SELECTION                    = 174;
+const int SCIM_TRANS_CMD_SET_SELECTION                    = 175;
 
 // Socket IMEngine to Socket FrontEnd
 const int SCIM_TRANS_CMD_NEW_INSTANCE                     = 200;
@@ -566,6 +568,7 @@ const int SCIM_TRANS_CMD_UPDATE_SCREEN                    = 400;
 const int SCIM_TRANS_CMD_UPDATE_SPOT_LOCATION             = 401;
 const int ISM_TRANS_CMD_UPDATE_CURSOR_POSITION            = 402;
 const int ISM_TRANS_CMD_UPDATE_SURROUNDING_TEXT           = 403;
+const int ISM_TRANS_CMD_UPDATE_SELECTION                  = 404;
 
 // Privately used by panel.
 const int SCIM_TRANS_CMD_PANEL_EXIT                       = 500;
@@ -625,7 +628,8 @@ const int ISM_TRANS_CMD_SEND_CANDIDATE_WILL_HIDE_ACK      = 1013;
 const int ISM_TRANS_CMD_GET_PANEL_CLIENT_ID               = 1014;
 const int ISM_TRANS_CMD_REGISTER_PANEL_CLIENT             = 1015;
 const int ISM_TRANS_CMD_GET_ISE_STATE                     = 1016;
-
+const int ISM_TRANS_CMD_GET_ACTIVE_HELPER_OPTION          = 1017;
+const int ISM_TRANS_CMD_SET_INITIAL_ISE_BY_UUID           = 1018;
 
 /* IMControl to ISE */
 const int ISM_TRANS_CMD_SET_ISE_MODE                      = 1108;
old mode 100644 (file)
new mode 100755 (executable)
index 2bb7cb0..12cd5f9
@@ -209,7 +209,7 @@ Transaction::read_from_socket (const Socket &socket, int timeout)
 
         m_holder->request_buffer_size (size);
 
-        while (size != 0) {
+        while (size > 0) {
             nbytes = socket.read_with_timeout (m_holder->m_buffer + m_holder->m_write_pos, size, timeout);
             if (nbytes <= 0) {
                 m_holder->m_write_pos = SCIM_TRANS_HEADER_SIZE;
@@ -280,6 +280,8 @@ Transaction::read_from_buffer (const void *buf, size_t bufsize)
 #ifdef ENABLE_CHECKMSG
         if (checksum == m_holder->calc_checksum ())
             return true;
+#else
+        return true;
 #endif
     }
     return false;
@@ -538,6 +540,25 @@ Transaction::put_data (const char *raw, size_t bufsize)
 }
 
 void
+Transaction::put_dataw (const char *raw, size_t bufsize)
+{
+    if (!raw || !bufsize)
+        return;
+
+    m_holder->request_buffer_size (bufsize + sizeof (uint32) + 1);
+
+    m_holder->m_buffer [m_holder->m_write_pos++] = (unsigned char) SCIM_TRANS_DATA_WSTRING;
+
+    scim_uint32tobytes (m_holder->m_buffer + m_holder->m_write_pos, (uint32) bufsize);
+
+    m_holder->m_write_pos += sizeof (uint32);
+
+    memcpy (m_holder->m_buffer + m_holder->m_write_pos, raw, bufsize);
+
+    m_holder->m_write_pos += bufsize;
+}
+
+void
 Transaction::put_data (const Transaction &trans)
 {
     if (!trans.valid ())
index e28c777..2b60437 100644 (file)
@@ -230,6 +230,11 @@ public:
     void put_data (const char *raw, size_t bufsize);
 
     /**
+     * @brief Store a raw buffer into this transaction.
+     */
+    void put_dataw (const char *raw, size_t bufsize);
+
+    /**
      * @brief Store another Transaction object into this transaction.
      */
     void put_data (const Transaction &trans);
index 001737f..4cfbf43 100644 (file)
 #include "scim_private.h"
 #include "scim.h"
 
+#ifdef LOG_TAG
+# undef LOG_TAG
+#endif
+#define LOG_TAG     "ISF_UTILITY"
+
 namespace scim {
 
 EAPI int
@@ -71,60 +76,71 @@ utf8_mbtowc (ucs4_t *pwc, const unsigned char *src, int src_len)
     } else if (c < 0xe0) {
         if (src_len < 2)
             return RET_TOOFEW(0);
-        if (!((src [1] ^ 0x80) < 0x40))
+        unsigned char utf8_x1 = src [1] ^ 0x80;
+        if (utf8_x1 >= 0x40)
             return RET_ILSEQ;
         *pwc = ((ucs4_t) (c & 0x1f) << 6)
-                 | (ucs4_t) (src [1] ^ 0x80);
+                 | (ucs4_t) utf8_x1;
         return 2;
     } else if (c < 0xf0) {
         if (src_len < 3)
             return RET_TOOFEW(0);
-        if (!((src [1] ^ 0x80) < 0x40 && (src [2] ^ 0x80) < 0x40
+        unsigned char utf8_x1 = src[1] ^ 0x80;
+        unsigned char utf8_x2 = src[2] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2) < 0x40
                 && (c >= 0xe1 || src [1] >= 0xa0)))
             return RET_ILSEQ;
         *pwc = ((ucs4_t) (c & 0x0f) << 12)
-                 | ((ucs4_t) (src [1] ^ 0x80) << 6)
-                 | (ucs4_t) (src [2] ^ 0x80);
+                 | ((ucs4_t) (utf8_x1) << 6)
+                 | (ucs4_t) (utf8_x2);
         return 3;
     } else if (c < 0xf8) {
         if (src_len < 4)
             return RET_TOOFEW(0);
-        if (!((src [1] ^ 0x80) < 0x40 && (src [2] ^ 0x80) < 0x40
-                && (src [3] ^ 0x80) < 0x40
+        unsigned char utf8_x1 = src[1] ^ 0x80;
+        unsigned char utf8_x2 = src[2] ^ 0x80;
+        unsigned char utf8_x3 = src[3] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3) < 0x40
                 && (c >= 0xf1 || src [1] >= 0x90)))
             return RET_ILSEQ;
         *pwc = ((ucs4_t) (c & 0x07) << 18)
-                 | ((ucs4_t) (src [1] ^ 0x80) << 12)
-                 | ((ucs4_t) (src [2] ^ 0x80) << 6)
-                 | (ucs4_t) (src [3] ^ 0x80);
+                 | ((ucs4_t) (utf8_x1) << 12)
+                 | ((ucs4_t) (utf8_x2) << 6)
+                 | (ucs4_t) (utf8_x3);
         return 4;
     } else if (c < 0xfc) {
         if (src_len < 5)
             return RET_TOOFEW(0);
-        if (!((src [1] ^ 0x80) < 0x40 && (src [2] ^ 0x80) < 0x40
-                && (src [3] ^ 0x80) < 0x40 && (src [4] ^ 0x80) < 0x40
+        unsigned char utf8_x1 = src[1] ^ 0x80;
+        unsigned char utf8_x2 = src[2] ^ 0x80;
+        unsigned char utf8_x3 = src[3] ^ 0x80;
+        unsigned char utf8_x4 = src[4] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3 | utf8_x4) < 0x40
                 && (c >= 0xf9 || src [1] >= 0x88)))
             return RET_ILSEQ;
         *pwc = ((ucs4_t) (c & 0x03) << 24)
-                 | ((ucs4_t) (src [1] ^ 0x80) << 18)
-                 | ((ucs4_t) (src [2] ^ 0x80) << 12)
-                 | ((ucs4_t) (src [3] ^ 0x80) << 6)
-                 | (ucs4_t) (src [4] ^ 0x80);
+                 | ((ucs4_t) (utf8_x1) << 18)
+                 | ((ucs4_t) (utf8_x2) << 12)
+                 | ((ucs4_t) (utf8_x3) << 6)
+                 | (ucs4_t) (utf8_x4);
         return 5;
     } else if (c < 0xfe) {
         if (src_len < 6)
             return RET_TOOFEW(0);
-        if (!((src [1] ^ 0x80) < 0x40 && (src [2] ^ 0x80) < 0x40
-                && (src [3] ^ 0x80) < 0x40 && (src [4] ^ 0x80) < 0x40
-                && (src [5] ^ 0x80) < 0x40
+        unsigned char utf8_x1 = src[1] ^ 0x80;
+        unsigned char utf8_x2 = src[2] ^ 0x80;
+        unsigned char utf8_x3 = src[3] ^ 0x80;
+        unsigned char utf8_x4 = src[4] ^ 0x80;
+        unsigned char utf8_x5 = src[5] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3 | utf8_x4 | utf8_x5) < 0x40
                 && (c >= 0xfd || src [1] >= 0x84)))
             return RET_ILSEQ;
         *pwc = ((ucs4_t) (c & 0x01) << 30)
-                 | ((ucs4_t) (src [1] ^ 0x80) << 24)
-                 | ((ucs4_t) (src [2] ^ 0x80) << 18)
-                 | ((ucs4_t) (src [3] ^ 0x80) << 12)
-                 | ((ucs4_t) (src [4] ^ 0x80) << 6)
-                 | (ucs4_t) (src [5] ^ 0x80);
+                 | ((ucs4_t) (utf8_x1) << 24)
+                 | ((ucs4_t) (utf8_x2) << 18)
+                 | ((ucs4_t) (utf8_x3) << 12)
+                 | ((ucs4_t) (utf8_x4) << 6)
+                 | (ucs4_t) (utf8_x5);
         return 6;
     } else
         return RET_ILSEQ;
@@ -137,8 +153,12 @@ utf8_wctomb (unsigned char *dest, ucs4_t wc, int dest_size)
         return 0;
 
     int count;
-    if (wc < 0x80)
-        count = 1;
+    if (wc < 0x80) { // most offen case
+        if (dest_size < 1)
+            return RET_TOOSMALL;
+        dest[0] = wc;
+        return 1;
+    }
     else if (wc < 0x800)
         count = 2;
     else if (wc < 0x10000)
@@ -167,17 +187,74 @@ utf8_wctomb (unsigned char *dest, ucs4_t wc, int dest_size)
 EAPI ucs4_t
 utf8_read_wchar (std::istream &is)
 {
-    unsigned char utf8[6];
-    ucs4_t wc;
-    int count;
+    unsigned char utf8[5] = {0};
+    unsigned char utf8_x_;
 
-    memset (utf8, 0, sizeof(unsigned char) * 6);
-    for (int i=0; i<6; ++i) {
-        is.read ((char*)(utf8+i), sizeof(unsigned char));
-        if ((count=utf8_mbtowc (&wc, utf8, i+1)) > 0)
-            return wc;
-        if (count == RET_ILSEQ)
+    is.read ((char*)(&utf8_x_), sizeof(unsigned char)); // reducing utf8 char sequence to ucs4 convertations
+    if (utf8_x_ < 0x80) {
+        return (ucs4_t)utf8_x_;
+    } else if (utf8_x_ < 0xc2) {
+        return 0;
+    } else if (utf8_x_ < 0xe0) {
+        unsigned char utf8_x1;
+        is.read ((char*)(&utf8_x1), sizeof(unsigned char));
+        utf8_x1 ^= 0x80;
+        if (utf8_x1 >= 0x40)
             return 0;
+        return ((ucs4_t) (utf8_x_ & 0x1f) << 6)
+              | (ucs4_t) (utf8_x1);
+    } else if (utf8_x_ < 0xf0) {
+        is.read ((char*)(&utf8[0]), 2*sizeof(unsigned char));
+        unsigned char utf8_x1 = utf8[0] ^ 0x80;
+        unsigned char utf8_x2 = utf8[1] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2) < 0x40
+           && (utf8_x_ >= 0xe1 || utf8[0] >= 0xa0)))
+            return 0;
+        return ((ucs4_t) (utf8_x_ & 0x0f) << 12)
+             | ((ucs4_t) (utf8_x1) << 6)
+             |  (ucs4_t) (utf8_x2);
+    } else if (utf8_x_ < 0xf8) {
+        is.read ((char*)(&utf8[0]), 3*sizeof(unsigned char));
+        unsigned char utf8_x1 = utf8[0] ^ 0x80;
+        unsigned char utf8_x2 = utf8[1] ^ 0x80;
+        unsigned char utf8_x3 = utf8[2] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3) < 0x40
+           && (utf8_x_ >= 0xf1 || utf8[0] >= 0x90)))
+            return 0;
+        return ((ucs4_t) (utf8_x_ & 0x07) << 18)
+             | ((ucs4_t) (utf8_x1) << 12)
+             | ((ucs4_t) (utf8_x2) << 6)
+             |  (ucs4_t) (utf8_x3);
+    } else if (utf8_x_ < 0xfc) {
+        is.read ((char*)(&utf8[0]), 4*sizeof(unsigned char));
+        unsigned char utf8_x1 = utf8[0] ^ 0x80;
+        unsigned char utf8_x2 = utf8[1] ^ 0x80;
+        unsigned char utf8_x3 = utf8[2] ^ 0x80;
+        unsigned char utf8_x4 = utf8[3] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3 | utf8_x4) < 0x40
+           && (utf8_x_ >= 0xf9 || utf8[0] >= 0x88)))
+            return 0;
+        return ((ucs4_t) (utf8_x_ & 0x03) << 24)
+             | ((ucs4_t) (utf8_x1) << 18)
+             | ((ucs4_t) (utf8_x2) << 12)
+             | ((ucs4_t) (utf8_x3) << 6)
+             |  (ucs4_t) (utf8_x4);
+    } else if (utf8_x_ < 0xfe) {
+        is.read ((char*)(&utf8[0]), 5*sizeof(unsigned char));
+        unsigned char utf8_x1 = utf8[0] ^ 0x80;
+        unsigned char utf8_x2 = utf8[1] ^ 0x80;
+        unsigned char utf8_x3 = utf8[2] ^ 0x80;
+        unsigned char utf8_x4 = utf8[3] ^ 0x80;
+        unsigned char utf8_x5 = utf8[4] ^ 0x80;
+        if (!((utf8_x1 | utf8_x2 | utf8_x3 | utf8_x4 | utf8_x5) < 0x40
+           && (utf8_x_ >= 0xfd || utf8[0] >= 0x84)))
+            return 0;
+        return ((ucs4_t) (utf8_x_ & 0x01) << 30)
+             | ((ucs4_t) (utf8_x1) << 24)
+             | ((ucs4_t) (utf8_x2) << 18)
+             | ((ucs4_t) (utf8_x3) << 12)
+             | ((ucs4_t) (utf8_x4) << 6)
+             |  (ucs4_t) (utf8_x5);
     }
     return 0;
 }
@@ -706,7 +783,7 @@ struct __Language {
 static __Language __languages [] = {
     { "C",        NULL, N_("English Keyboard"), NULL, NULL},
     { "am_ET",    NULL, N_("Amharic"), NULL, NULL },
-    { "ar",       "ar", N_("Arabic"), NULL, NULL },
+    { "ar",       "ar", N_("Arabic"), "العربية", NULL },
     { "ar_EG",    NULL, N_("Arabic (Egypt)"), NULL, NULL },
     { "ar_LB",    NULL, N_("Arabic (Lebanon)"), NULL, NULL },
     { "as_IN",    NULL, N_("Assamese"), NULL, NULL},
@@ -717,7 +794,7 @@ static __Language __languages [] = {
     { "bn_BD",    NULL, N_("Bengali"), "বাংলা", NULL },
     { "bn_IN",    NULL, N_("Bengali (India)"), "বাংলা", NULL },
     { "bo",       NULL, N_("Tibetan"), NULL, NULL },
-    { "bs_BA",    NULL, N_("Bosnian"), NULL, NULL },
+    { "bs_BA",    NULL, N_("Bosnian"), "Bosanski", NULL },
     { "ca_ES",    NULL, N_("Catalan"), "Català", "@euro" },
     { "cs_CZ",    NULL, N_("Czech"), "čeština", NULL },
     { "cy_GB",    NULL, N_("Welsh"), "Cymraeg", NULL },
@@ -728,13 +805,14 @@ static __Language __languages [] = {
     { "en"   ,    NULL, N_("English"), "English", NULL },
     { "en_AU",    NULL, N_("English (Australian)"), "Australian English", NULL },
     { "en_CA",    NULL, N_("English (Canadian)"), "Canadian English", NULL },
-    { "en_GB",    NULL, N_("English (British)"), "British English", ".iso885915" },
+    { "en_GB",    NULL, N_("English (United Kingdom)"), "English (United Kingdom)", ".iso885915" },
     { "en_IE",    NULL, N_("English (Ireland)"), "Irish English", NULL },
-    { "en_US",    NULL, N_("English (American)"), "American English", ".iso885915" },
+    { "en_US",    NULL, N_("English (United States)"), "English (United States)", ".iso885915" },
     { "eo",       NULL, N_("Esperanto"), "Esperanto", NULL },
     { "es",    "es_ES", N_("Spanish"), "Español", NULL },
     { "es_ES",    NULL, N_("Spanish"), "Español", "@euro" },
     { "es_MX",    NULL, N_("Spanish (Mexico)"), "Español (Mexico)", NULL },
+    { "es_US",    NULL, N_("Spanish (United States)"), "Español (United States)", NULL },
     { "et_EE",    NULL, N_("Estonian"), "Eesti", ".iso885915" },
     { "eu_ES",    NULL, N_("Basque"), "Euskara", "@euro" },
     { "fa_IR",    NULL, N_("Persian"), "فارسی", NULL },
@@ -742,7 +820,7 @@ static __Language __languages [] = {
     { "fr_FR",    NULL, N_("French"), "Français", "@euro" },
     { "ga_IE",    NULL, N_("Irish"), "Gaeilge", "@euro" },
     { "gl_ES",    NULL, N_("Galician"), "Galego", "@euro" },
-    { "gu_IN",    NULL, N_("Gujarati"), NULL, NULL },
+    { "gu_IN",    NULL, N_("Gujarati"), "ગુજરાતી", NULL },
     { "he_IL",    NULL, N_("Hebrew"), "עברית", NULL },
     { "hi_IN",    NULL, N_("Hindi"), "हिंदी", NULL },
     { "hr_HR",    NULL, N_("Croatian"), "Hrvatski", NULL },
@@ -771,7 +849,7 @@ static __Language __languages [] = {
     { "ne_NP",    NULL, N_("Nepali"), NULL, NULL },
     { "nl_NL",    NULL, N_("Dutch"), "Nederlands", "@euro" },
     { "nn_NO",    NULL, N_("Norwegian (Nynorsk)"), "Norsk (Nynorsk)", NULL },
-    { "no_NO",    NULL, N_("Norwegian (Bokmal)"), "Norsk (Bokmål)", NULL },
+    { "nb_NO",    NULL, N_("Norwegian (Bokmal)"), "Norsk (Bokmål)", NULL },
     { "or_IN",    NULL, N_("Oriya"), NULL, NULL },
     { "pa_IN",    NULL, N_("Punjabi"), NULL, NULL },
     { "pl_PL",    NULL, N_("Polish"), "Polski", NULL },
@@ -810,37 +888,24 @@ static __Language __languages [] = {
     { "zh_SG", "zh_CN", N_("Chinese (Simplified)"), "中文 (简体)", ".GBK" },
     { "zh_TW",    NULL, N_("Chinese (Traditional)"), "中文 (繁體)", ".eucTW" },
 
-    { "nl_NL",    NULL, N_("Dutch"), "Dutch", NULL },
     { "nl_BE",    NULL, N_("Dutch (Belgian)"), "Dutch (Belgian)", NULL },
-    { "en_US",    NULL, N_("English (United States)"), "English (United States)", NULL },
-    { "en_GB",    NULL, N_("English (United Kingdom)"), "English (United Kingdom)", NULL },
-    { "en_AU",    NULL, N_("English (Australian)"), "English (Australian)", NULL },
-    { "en_CA",    NULL, N_("English (Canadian)"), "English (Canadian)", NULL },
     { "en_NZ",    NULL, N_("English (New Zealand)"), "English (New Zealand)", NULL },
-    { "en_IE",    NULL, N_("English (Irish)"), "English (Irish)", NULL },
     { "en_ZA",    NULL, N_("English (South Africa)"), "English (South Africa)", NULL },
     { "en_JM",    NULL, N_("English (Jamaica)"), "English (Jamaica)", NULL },
     { "en_BZ",    NULL, N_("English (Belize)"), "English (Belize)", NULL },
     { "en_TT",    NULL, N_("English (Trinidad)"), "English (Trinidad)", NULL },
     { "en_ZW",    NULL, N_("English (Zimbabwe)"), "English (Zimbabwe)", NULL },
     { "en_PH",    NULL, N_("English (Philippines)"), "English (Philippines)", NULL },
-    { "fr_FR",    NULL, N_("French"), "French", NULL },
     { "fr_BE",    NULL, N_("French (Belgian)"), "French (Belgian)", NULL },
     { "fr_CA",    NULL, N_("French (Canadian)"), "French (Canadian)", NULL },
     { "fr_CH",    NULL, N_("French (Swiss)"), "French (Swiss)", NULL },
     { "fr_LU",    NULL, N_("French (Luxembourg)"), "French (Luxembourg)", NULL },
     { "fr_MC",    NULL, N_("French (Monaco)"), "French (Monaco)", NULL },
-    { "de_DE",    NULL, N_("German"), "German", NULL },
     { "de_CH",    NULL, N_("German (Swiss)"), "German (Swiss)", NULL },
     { "de_AT",    NULL, N_("German (Austrian)"), "German (Austrian)", NULL },
     { "de_LU",    NULL, N_("German (Luxembourg)"), "German (Luxembourg)", NULL },
     { "de_LI",    NULL, N_("German (Liechtenstein)"), "German (Liechtenstein)", NULL },
-    { "it_IT",    NULL, N_("Italian"), "Italian", NULL },
     { "it_CH",    NULL, N_("Italian (Swiss)"), "Italian (Swiss)", NULL },
-    { "pt_BR",    NULL, N_("Portuguese (Brazilian)"), "Portuguese (Brazilian)", NULL },
-    { "pt_PT",    NULL, N_("Portuguese"), "Portuguese", NULL },
-    { "es_ES",    NULL, N_("Spanish (Traditional Sort)"), "Spanish (Traditional Sort)", NULL },
-    { "es_MX",    NULL, N_("Spanish (Mexican)"), "Spanish (Mexican)", NULL },
     { "es_GT",    NULL, N_("Spanish (Guatemala)"), "Spanish (Guatemala)", NULL },
     { "es_CR",    NULL, N_("Spanish (Costa Rica)"), "Spanish (Costa Rica)", NULL },
     { "es_PA",    NULL, N_("Spanish (Panama)"), "Spanish (Panama)", NULL },
@@ -858,48 +923,14 @@ static __Language __languages [] = {
     { "es_HN",    NULL, N_("Spanish (Honduras)"), "Spanish (Honduras)", NULL },
     { "es_NI",    NULL, N_("Spanish (Nicaragua)"), "Spanish (Nicaragua)", NULL },
     { "es_PR",    NULL, N_("Spanish (Puerto Rico)"), "Spanish (Puerto Rico)", NULL },
-    { "eu_ES",    NULL, N_("Basque"), "Basque", NULL },
-    { "ca_ES",    NULL, N_("Catalan"), "Catalan", NULL },
-    { "da_DK",    NULL, N_("Danish"), "Danish", NULL },
     { "af_AF",    NULL, N_("Afrikaans"), "Afrikaans", NULL },
-    { "is_IS",    NULL, N_("Icelandic"), "Icelandic", NULL },
-    { "fi_FI",    NULL, N_("Finnish"), "Finnish", NULL },
-    { "ms_MY",    NULL, N_("Malay (Malaysia)"), "Malay (Malaysia)", NULL },
     { "ms_BN",    NULL, N_("Malay (Brunei Darussalam)"), "Malay (Brunei Darussalam)", NULL },
     { "no_NO",    NULL, N_("Norwegian"), "Norwegian", NULL },
-    { "sv_SE",    NULL, N_("Swedish"), "Swedish", NULL },
-    { "sv_FI",    NULL, N_("Swedish (Finland)"), "Swedish (Finland)", NULL },
-    { "cs_CZ",    NULL, N_("Czech"), "Czech", NULL },
-    { "hu_HU",    NULL, N_("Hungarian"), "Hungarian", NULL },
-    { "pl_PL",    NULL, N_("Polish"), "Polish", NULL },
-    { "ro_RO",    NULL, N_("Romanian"), "Romanian", NULL },
     { "sr_RS",    NULL, N_("Serbian (Latin)"), "Serbian (Latin)", NULL },
-    { "sk_SK",    NULL, N_("Slovak"), "Slovak", NULL },
-    { "sl_SI",    NULL, N_("Slovenian"), "Slovenian", NULL },
-    { "et_EE",    NULL, N_("Estonian"), "Estonian", NULL },
-    { "lv_LV",    NULL, N_("Latvian"), "Latvian", NULL },
-    { "lt_LT",    NULL, N_("Lithuanian"), "Lithuanian", NULL },
-    { "el_GR",    NULL, N_("Greek"), "Greek", NULL },
-    { "bg_BG",    NULL, N_("Bulgarian"), "Bulgarian", NULL },
-    { "kk_KZ",    NULL, N_("Kazakh"), "Kazakh", NULL },
-    { "mk_MK",    NULL, N_("Macedonian"), "Macedonian", NULL },
-    { "ru_RU",    NULL, N_("Russian"), "Russian", NULL },
     { "sr_RS",    NULL, N_("Serbian (Cyrillic)"), "Serbian (Cyrillic)", NULL },
-    { "uk_UA",    NULL, N_("Ukrainian"), "Ukrainian", NULL },
-    { "tr_TR",    NULL, N_("Turkish"), "Turkish", NULL },
-    { "uz_UZ",    NULL, N_("Uzbek (Latin)"), "Uzbek (Latin)", NULL },
-    { "ja_JP",    NULL, N_("Japanese"), "Japanese", NULL },
-    { "ko_KR",    NULL, N_("Korean"), "Korean", NULL },
-    { "zh_TW",    NULL, N_("Chinese (Taiwan)"), "Chinese (Taiwan)", NULL },
-    { "zh_HK",    NULL, N_("Chinese (Hong Kong)"), "Chinese (Hong Kong)", NULL },
     { "zh_MO",    NULL, N_("Chinese (Macau)"), "Chinese (Macau)", NULL },
-    { "zh_CN",    NULL, N_("Chinese (PRC)"), "Chinese (PRC)", NULL },
-    { "zh_SG",    NULL, N_("Chinese (Singapore)"), "Chinese (Singapore)", NULL },
-    { "th_TH",    NULL, N_("Thai"), "Thai", NULL },
-    { "he_IL",    NULL, N_("Hebrew"), "Hebrew", NULL },
     { "ar_SA",    NULL, N_("Arabic (Saudi Arabia)"), "Arabic (Saudi Arabia)", NULL },
     { "ar_IQ",    NULL, N_("Arabic (Iraq)"), "Arabic (Iraq)", NULL },
-    { "ar_EG",    NULL, N_("Arabic (Egypt)"), "Arabic (Egypt)", NULL },
     { "ar_LY",    NULL, N_("Arabic (Libya)"), "Arabic (Libya)", NULL },
     { "ar_DZ",    NULL, N_("Arabic (Algeria)"), "Arabic (Algeria)", NULL },
     { "ar_MA",    NULL, N_("Arabic (Morocco)"), "Arabic (Morocco)", NULL },
@@ -908,31 +939,23 @@ static __Language __languages [] = {
     { "ar_YE",    NULL, N_("Arabic (Yemen)"), "Arabic (Yemen)", NULL },
     { "ar_SY",    NULL, N_("Arabic (Syria)"), "Arabic (Syria)", NULL },
     { "ar_JO",    NULL, N_("Arabic (Jordan)"), "Arabic (Jordan)", NULL },
-    { "ar_LB",    NULL, N_("Arabic (Lebanon)"), "Arabic (Lebanon)", NULL },
     { "ar_KW",    NULL, N_("Arabic (Kuwait)"), "Arabic (Kuwait)", NULL },
     { "ar_AE",    NULL, N_("Arabic (UAE)"), "Arabic (UAE)", NULL },
     { "ar_BH",    NULL, N_("Arabic (Bahrain)"), "Arabic (Bahrain)", NULL },
     { "ar_QA",    NULL, N_("Arabic (Qatar)"), "Arabic (Qatar)", NULL },
-    { "ur_PK",    NULL, N_("Urdu"), "Urdu", NULL },
-    { "vi_VN",    NULL, N_("Vietnamese"), "Vietnamese", NULL },
-    { "hi_IN",    NULL, N_("Hindi"), "Hindi", NULL },
-    { "te_IN",    NULL, N_("Telugu"), "Telugu", NULL },
-    { "mr_IN",    NULL, N_("Marathi"), "Marathi", NULL },
-    { "ta_IN",    NULL, N_("Tamil"), "Tamil", NULL },
-    { "bn_IN",    NULL, N_("Bengali"), "Bengali", NULL },
-    { "gu_IN",    NULL, N_("Gujarati"), "Gujarati", NULL },
-    { "ml_IN",    NULL, N_("Malayalam"), "Malayalam", NULL },
-    { "pa_IN",    NULL, N_("Punjabi"), "Punjabi", NULL },
-    { "ka_GE",    NULL, N_("Georgian"), "Georgian", NULL },
     { "az_IR",    NULL, N_("Azerbaijani"), "Azerbaijani", NULL },
-    { "gl_ES",    NULL, N_("Galician"), "Galician", NULL },
     { "ha_BJ",    NULL, N_("Hausa"), "Hausa", NULL },
-    { "ga_IE",    NULL, N_("Irish"), "Irish", NULL },
-    { "si_LK",    NULL, N_("Sinhala"), "Sinhala", NULL },
     { "cy_UK",    NULL, N_("Welsh"), "Welsh", NULL },
     { "xh_ZA",    NULL, N_("Xhosa"), "Xhosa", NULL },
     { "yo_NG",    NULL, N_("Yoruba"), "Yoruba", NULL },
     { "zu_ZA",    NULL, N_("Zulu"), "Zulu", NULL },
+    { "hg_IN",    NULL, N_("Hinglish"), "Hinglish", NULL },
+    { "su_ID",    NULL, N_("Sundanese"), "Basa Sunda", NULL },
+    { "tl_PH",    NULL, N_("Tagalog"), "Tagalog", NULL },
+    { "af_ZA",    NULL, N_("Afrikaans"), "Afrikaans", NULL },
+    { "jv_ID",    NULL, N_("Javanese"), "Basa Jawa", NULL },
+    { "km_KH",    NULL, N_("Khmer"), "ភាសាខ្មែរ", NULL },
+    { "es_LA",    NULL, N_("Spanish (Latin America)"), "Español (América Latina)", NULL },
 
     { "", "", "", NULL, NULL }
 };
@@ -1145,6 +1168,11 @@ EAPI int  scim_launch (bool          daemon,
 
     child_pid = fork ();
 
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  fork result : %d, user %s\n",
+        time (0), getpid (), getppid (), __FILE__, __func__, child_pid, scim_get_user_name ().c_str ());
+    isf_save_log (buf);
+
     // Error fork.
     if (child_pid < 0) return -1;
 
@@ -1201,8 +1229,10 @@ EAPI int scim_launch_panel (bool          daemon,
 
     new_argv [new_argc ++] = strdup (panel_program.c_str ());
 
-    new_argv [new_argc ++] = strdup ("--display");
-    new_argv [new_argc ++] = strdup (display.c_str ());
+    if (display.length() > 0) {
+        new_argv [new_argc ++] = strdup ("--display");
+        new_argv [new_argc ++] = strdup (display.c_str ());
+    }
 
     new_argv [new_argc ++] = strdup ("-c");
     new_argv [new_argc ++] = strdup (config.c_str ());
@@ -1221,6 +1251,11 @@ EAPI int scim_launch_panel (bool          daemon,
 
     child_pid = fork ();
 
+    char buf[256] = {0};
+    snprintf (buf, sizeof (buf), "time:%ld  pid:%d ppid:%d  %s  %s  fork result : %d\n",
+        time (0), getpid (), getppid (), __FILE__, __func__, child_pid);
+    isf_save_log (buf);
+
     // Error fork.
     if (child_pid < 0) return -1;
 
@@ -1303,14 +1338,14 @@ EAPI void scim_daemon ()
 #endif
 }
 
-#define LOG_TAG     "ISF_UTILITY"
-
 EAPI void isf_save_log (const char *str)
 {
+    /*
     String strLogFile = scim_get_user_data_dir () + String (SCIM_PATH_DELIM_STRING) + String ("isf.log");
     std::ofstream isf_log_file (strLogFile.c_str (), std::ios::app);
     isf_log_file << str;
     isf_log_file.flush ();
+    */
 
     LOGD ("%s", str);
 }
index a6296a4..95dab0d 100644 (file)
@@ -515,7 +515,8 @@ typedef enum
 } ISF_CANDIDATE_PORTRAIT_LINE_T;
 
 
-#define PROP_X_EXT_KEYBOARD_EXIST       "X External Keyboard Exist"
+#define PROP_X_EXT_KEYBOARD_INPUT_DETECTED  "HW Keyboard Input Started"
+#define PROP_X_EXT_KEYBOARD_EXIST           "X External Keyboard Exist"
 
 #define VCONFKEY_AUTOCAPITAL_ALLOW_BOOL "file/private/isf/autocapital_allow"
 #define VCONFKEY_AUTOPERIOD_ALLOW_BOOL  "file/private/isf/autoperiod_allow"
index 0f7b336..f8638e6 100644 (file)
@@ -1,13 +1,13 @@
-%define _usrdir /usr
-%define _ugdir  %{_usrdir}/ug
-
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.7104
-Release:    0
+Version:    2.4.7424
+Release:    2
 Group:      Graphics & UI Framework/Input
 License:    LGPL-2.1
 Source0:    %{name}-%{version}.tar.gz
+%if "%{_repository}" != "wearable"
+Source1:    scim.service
+%endif
 Source1001: isf.manifest
 BuildRequires:  edje-bin
 BuildRequires:  embryo-bin
@@ -17,24 +17,29 @@ BuildRequires:  pkgconfig(libprivilege-control)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(vconf)
+%if "%{_repository}" != "wearable"
 BuildRequires:  pkgconfig(ui-gadget-1)
-BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(minicontrol-provider)
+%endif
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(tts)
+BuildRequires:  pkgconfig(security-server)
+BuildRequires:  pkgconfig(edbus)
+BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(feedback)
-BuildRequires:  pkgconfig(ail)
 BuildRequires:  efl-assist-devel
+BuildRequires:  pkgconfig(ail)
 BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post): /sbin/ldconfig /usr/bin/vconftool
 Requires(postun): /sbin/ldconfig
 
 %description
-Input Service Framewok (ISF) is an input method (IM) platform,
-and it has been derived from SCIM.
+Input Service Framewok (ISF) is an input method (IM) platform, and it has been derived from SCIM.
+
 
 %package devel
 Summary:    ISF header files
@@ -43,66 +48,81 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 This package contains ISF header files for ISE development.
 
-%package -n ug-isfsetting-efl
-Summary:    ISF setting ug
-Requires:   %{name} = %{version}-%{release}
-
-%description -n ug-isfsetting-efl
-ISF setting UI Gadget
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %build
+%if 0%{?sec_build_binary_debug_enable}
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+%endif
+
+%if "%{_repository}" == "wearable"
+CFLAGS+=" -D_WEARABLE";
+CXXFLAGS+=" -D_WEARABLE";
+%else
+CFLAGS+=" -D_MOBILE";
+CXXFLAGS+=" -D_MOBILE";
+%endif
+
 export GC_SECTIONS_FLAGS="-fdata-sections -ffunction-sections -Wl,--gc-sections"
 CFLAGS+=" -fvisibility=hidden ${GC_SECTIONS_FLAGS} "; export CFLAGS
 CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} ";export CXXFLAGS
 
 %autogen
 %configure --disable-static \
-            --disable-tray-icon \
-            --disable-filter-sctc
+               --disable-tray-icon \
+               --disable-filter-sctc \
+               --disable-frontend-x11
 make %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 
 %make_install
-
 mkdir -p %{buildroot}/etc/scim/conf
 mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/Helper
 mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI
 mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine
 
-%find_lang isfsetting-efl
+%if "%{_repository}" != "wearable"
+install -d %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
+install -d %{buildroot}%{_libdir}/systemd/system
+install -m0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
+ln -sf ../../system/scim.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/scim.service
+%endif
+
 %find_lang scim
 
 cat scim.lang > isf.lang
-
 %post
 /sbin/ldconfig
 
 
-/usr/bin/vconftool set -t bool file/private/isf/autocapital_allow 1 -g 6514 || :
-/usr/bin/vconftool set -t bool file/private/isf/autoperiod_allow 0 -g 6514 || :
-/usr/bin/vconftool set -t string db/isf/input_language "en_US" -g 5000 || :
-/usr/bin/vconftool set -t int memory/isf/input_panel_state 0 -i -g 5000 || :
+/usr/bin/vconftool set -t bool file/private/isf/autocapital_allow 1 -s system::vconf_inhouse -g 6514 || :
+/usr/bin/vconftool set -t bool file/private/isf/autoperiod_allow 0 -s system::vconf_inhouse -g 6514 || :
+/usr/bin/vconftool set -t string db/isf/input_language "en_US" -s system::vconf_misc -g 5000 || :
+/usr/bin/vconftool set -t int memory/isf/input_panel_state 0 -s system::vconf_inhouse -i -g 5000 || :
 
 %postun -p /sbin/ldconfig
 
-%post -n ug-isfsetting-efl
-mkdir -p /opt/ug/bin/
-ln -sf /usr/bin/ug-client /opt/ug/bin/isfsetting-efl
 
 %files -f isf.lang
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%dir /etc/scim/conf
 %dir /opt/apps/scim/lib/scim-1.0/1.4.0/Helper
 %dir /opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI
 %dir /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine
+%if "%{_repository}" == "wearable"
+%dir /etc/scim/conf
 %{_libdir}/systemd/user/core-efl.target.wants/scim.service
 %{_libdir}/systemd/user/scim.service
+%else
+%{_libdir}/systemd/system/graphical.target.wants/scim.service
+%{_libdir}/systemd/system/scim.service
+%endif
 %attr(755,root,root) %{_sysconfdir}/profile.d/isf.sh
 %{_sysconfdir}/scim/global
 %{_sysconfdir}/scim/config
@@ -129,9 +149,3 @@ ln -sf /usr/bin/ug-client /opt/ug/bin/isfsetting-efl
 %{_libdir}/libscim-*.so
 %{_libdir}/pkgconfig/isf.pc
 %{_libdir}/pkgconfig/scim.pc
-
-
-%files -n ug-isfsetting-efl -f isfsetting-efl.lang
-/usr/share/packages/ug-isfsetting-efl.xml
-%{_ugdir}/lib/libug-isfsetting-efl.so
-%{_datadir}/scim/isfsetting.edj
diff --git a/packaging/scim.service b/packaging/scim.service
new file mode 100644 (file)
index 0000000..03e835b
--- /dev/null
@@ -0,0 +1,16 @@
+[Unit]
+Description=Start the input service framework panel
+After=ac.service
+Requires=ac.service
+
+[Service]
+ExecStart=/usr/bin/scim -d
+Environment=HOME=/root
+EnvironmentFile=/etc/sysconfig/tizen-mobile-ui
+Nice=5
+OOMScoreAdjust=-100
+Restart=always
+RestartSec=2
+
+[Install]
+WantedBy=graphical.target
diff --git a/po/isfsetting_efl/Makefile.in.in b/po/isfsetting_efl/Makefile.in.in
deleted file mode 100755 (executable)
index 1ed2801..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-
-GETTEXT_PACKAGE = isfsetting-efl
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = /usr/ug/res
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-subdir = po
-install_sh = @install_sh@
-mkdir_p = @mkdir_p@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = $(srcdir)/ChangeLog $(srcdir)/Makefile.in.in $(srcdir)/POTFILES.in \
-$(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-       $(COMPILE) $<
-
-.po.pox:
-       $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox
-
-.po.mo:
-       $(MSGFMT) -o $@ $<
-
-.po.gmo:
-       file=`echo $* | sed 's,.*/,,'`.gmo \
-         && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-       sed -f ../intl/po2msg.sed < $< > $*.msg \
-         && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-       $(GENPOT)
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-       if test -n "$(MKINSTALLDIRS)"; then \
-         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-       else \
-         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-       fi
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         case "$$cat" in \
-           *.gmo) destdir=$(gnulocaledir);; \
-           *)     destdir=$(localedir);; \
-         esac; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-         if test -n "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $$dir; \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-         fi; \
-         if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-           echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-         else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-           echo "installing $(srcdir)/$$cat as" \
-                "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-         fi; \
-         if test -r $$cat.m; then \
-           $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-           echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-         else \
-           if test -r $(srcdir)/$$cat.m ; then \
-             $(INSTALL_DATA) $(srcdir)/$$cat.m \
-               $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-             echo "installing $(srcdir)/$$cat as" \
-                  "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-           else \
-             true; \
-           fi; \
-         fi; \
-       done
-       if test "$(PACKAGE)" = "glib"; then \
-         if test -n "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-                         $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-       else \
-         : ; \
-       fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-       done
-       if test "$(PACKAGE)" = "glib"; then \
-         rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-       fi
-
-check: all
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-       rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-       rm -fr *.o *.gmo
-       rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-       rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
-       rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot
-       dists="$(DISTFILES)"; \
-       for file in $$dists; do \
-         ln $$file $(distdir) 2> /dev/null \
-           || cp -p $$file $(distdir); \
-       done
-
-update-po: Makefile
-       $(MAKE) $(GETTEXT_PACKAGE).pot
-       tmpdir=`pwd`; \
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         echo "$$lang:"; \
-         result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-         if $$result; then \
-           if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-             rm -f $$tmpdir/$$lang.new.po; \
-            else \
-             if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-               :; \
-             else \
-               echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-               rm -f $$tmpdir/$$lang.new.po; \
-               exit 1; \
-             fi; \
-           fi; \
-         else \
-           echo "msgmerge for $$cat failed!"; \
-           rm -f $$tmpdir/$$lang.new.po; \
-         fi; \
-       done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-       ( if test 'x$(srcdir)' != 'x.'; then \
-           posrcprefix='$(top_srcdir)/'; \
-         else \
-           posrcprefix="../"; \
-         fi; \
-         rm -f $@-t $@ \
-           && (sed -e '/^#/d'                                          \
-                   -e "s/^\[.*\] +//"                                  \
-                   -e '/^[     ]*$$/d'                                 \
-                   -e "s@.*@   $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-               | sed -e '$$s/\\$$//') > $@-t \
-           && chmod a-w $@-t \
-           && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../../config.status POTFILES
-       cd ../.. \
-         && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-              $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/isfsetting_efl/POTFILES.in b/po/isfsetting_efl/POTFILES.in
deleted file mode 100755 (executable)
index 75431e7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-ism/extras/efl_setting/scim_setup_module_efl.cpp
-ism/extras/efl_setting/isf_setting_efl.cpp
diff --git a/po/isfsetting_efl/ar.po b/po/isfsetting_efl/ar.po
deleted file mode 100644 (file)
index b48163a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "تحديد لوحة المفاتيح"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "إعدادات لوحة المفاتيح"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "ﺖﻜﺒﻳﺭ ﺖﻠﻗﺎﺌﻳ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "ﺖﻜﺒﻳﺭ ﺎﻠﺣﺮﻓ ﺍﻷﻮﻟ ﻢﻧ ﺎﻠﺠﻤﻟﺓ ﺖﻠﻗﺎﺌﻳﺍ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "وضع علامات ترقيم تلقائيا"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "ﺇﺪﺧﺎﻟ ﻦﻘﻃﺓ ﺕﻮﻘﻓ ﺖﻠﻗﺎﺌﻳﺍ ﻊﺑﺭ ﻞﻤﺳ ﺵﺮﻴﻃ ﺎﻠﻤﺳﺎﻓﺓ ﻞﻣﺮﺘﻴﻧ" 
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "ﻝﻮﺣﺓ ﻢﻋﺭﻮﺿﺓ ﻊﻟﻯ ﺎﻠﺷﺎﺷﺓ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "ﻝﻮﺣﺓ ﻢﻓﺎﺘﻴﺣ ﺎﻠﺠﻫﺍﺯ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "ﻝﻮﺣﺓ ﺎﻠﻤﻓﺎﺘﻴﺣ"
diff --git a/po/isfsetting_efl/az.po b/po/isfsetting_efl/az.po
deleted file mode 100644 (file)
index e95bd05..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Klaviatura seçimi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Klaviatura parametrləri"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Avtomatik böyütmə"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Cümlənin ilk hərfini avtomatik böyüt"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Avto durğu işarələri"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Boşluq zolağına iki dəfə vurmaqla avtomatik nöqtə daxil edin"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Proqram təminatı klaviaturası"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Avadanlıq klaviaturası"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klaviatura"
diff --git a/po/isfsetting_efl/bg.po b/po/isfsetting_efl/bg.po
deleted file mode 100644 (file)
index 6b24ea0..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Избор на клавиатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Настройки на клавиатурата"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Автоматично преобразуване в главни"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Автоматично главна първа буква в изречението"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Автоматична пунктуация"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Автоматично вмъкване на точка с двукратно чукване на клавиша за интервал"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Софтуерна клавиатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Хардуерна клавиатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Клавиатура"
diff --git a/po/isfsetting_efl/ca.po b/po/isfsetting_efl/ca.po
deleted file mode 100644 (file)
index c003dd3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selecció de teclat"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Ajustaments del teclat"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Majúscula inicial automàticament"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Posar en majúscula la primera lletra de cada frase automàticament"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Puntuar automàticament"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Introdueixi un punt automàticament en prémer dos cops la barra espaiadora"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Teclat de software"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Teclat de hardware"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclat"
diff --git a/po/isfsetting_efl/cs.po b/po/isfsetting_efl/cs.po
deleted file mode 100644 (file)
index 8636dad..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Výběr klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Nastavení klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automaticky velká písmena na začátku vět"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automaticky velká první písmena ve větách"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatická interpunkce"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automaticky vložte tečku poklepáním na mezerník"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softwarová klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardwarová klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klávesnice"
diff --git a/po/isfsetting_efl/da.po b/po/isfsetting_efl/da.po
deleted file mode 100644 (file)
index b5d5b89..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Valg af tastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Tastaturindstillinger"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatiske store bogstaver"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatisk stort første bogstav i sætning"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatisk tegnsætning"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Indsæt automatisk et punktum ved at tappe to gange på mellemrumstasten"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softwaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardwaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatur"
diff --git a/po/isfsetting_efl/de_DE.po b/po/isfsetting_efl/de_DE.po
deleted file mode 100644 (file)
index 010dcf8..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Tastaturauswahl"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Tastatur-Einstellungen"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Autom. Großschreibung"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Ersten Buchstaben im Satz automatisch groß schreiben"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Autom. Satzzeichen setzen"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Punkt automatisch durch zweimaliges Tippen auf die Leertaste einfügen."
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softwaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardwaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatur"
-
diff --git a/po/isfsetting_efl/el_GR.po b/po/isfsetting_efl/el_GR.po
deleted file mode 100644 (file)
index 8596e8f..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Επιλογή πληκτρολογίου"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Ρυθμίσεις πληκτρολογίου"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Αυτόματη κεφαλαιοποίηση"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Αυτόματη κεφαλαιοποίηση του πρώτου γράμματος της πρότασης"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Αυτόματη στίξη"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Εισάγετε αυτόματα μια τελεία, πατώντας δύο φορές το πλήκτρο κενού"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Πληκτρολόγιο οθόνης"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Πληκτρολόγιο υλικού"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Πληκτρολόγιο"
-
diff --git a/po/isfsetting_efl/en.po b/po/isfsetting_efl/en.po
deleted file mode 100644 (file)
index b3689af..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Keyboard selection"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Keyboard settings"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Auto capitalisation"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatically capitalise first letter of sentence"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Auto punctuate"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automatically insert a full stop by tapping the space bar twice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Keyboard"
-
diff --git a/po/isfsetting_efl/en_PH.po b/po/isfsetting_efl/en_PH.po
deleted file mode 100644 (file)
index 9c02245..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Keyboard selection"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Keyboard settings"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Auto capitalization"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatically capitalize the first letter of each sentence"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Auto punctuate"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automatically insert a full stop by tapping the space bar twice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Keyboard"
diff --git a/po/isfsetting_efl/en_US.po b/po/isfsetting_efl/en_US.po
deleted file mode 100644 (file)
index e705411..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Keyboard selection"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Keyboard settings"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Auto capitalization"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatically capitalize first letter of sentence"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Auto punctuate"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automatically insert a full stop by tapping the space bar twice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware keyboard"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Keyboard"
diff --git a/po/isfsetting_efl/es_ES.po b/po/isfsetting_efl/es_ES.po
deleted file mode 100644 (file)
index 92973fc..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selección de teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Configuración del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Uso de mayúsculas automático"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Poner en mayúscula automáticamente la primera letra de las oraciones"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Puntuar automáticamente"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Introduzca manualmente una detención completa punteando la barra espaciadora dos veces"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Teclado de software"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Teclado de hardware"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclado"
diff --git a/po/isfsetting_efl/es_MX.po b/po/isfsetting_efl/es_MX.po
deleted file mode 100644 (file)
index ceea854..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 15:57+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:394
-#: ism/extras/efl_setting/isf_setting_efl.cpp:961
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1031
-msgid "Keyboard settings"
-msgstr "Configuración del teclado"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:608
-#: ism/extras/efl_setting/isf_setting_efl.cpp:703
-#: ism/extras/efl_setting/isf_setting_efl.cpp:940
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1012
-msgid "Keyboard selection"
-msgstr "Selección de teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:829
-msgid "Auto capitalization"
-msgstr "Uso de mayúsculas automático"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:849
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Escribir automáticamente en mayúscula la primera letra de una oración"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:882
-msgid "Automatic full stop"
-msgstr "Puntuación automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr ""
-"Pulse dos veces la barra de espacio para insertar automáticamente un punto final cuando usa el teclado Qwerty"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:917
-msgid "Software keyboard"
-msgstr "Software del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:981
-msgid "Hardware keyboard"
-msgstr "Hardware del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1062
-msgid "Keyboard"
-msgstr "Teclado"
diff --git a/po/isfsetting_efl/es_US.po b/po/isfsetting_efl/es_US.po
deleted file mode 100644 (file)
index 65f9b01..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selección de teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Configuración del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Uso de mayúsculas automático"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Escribir automáticamente en mayúscula la primera letra de una oración"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Detención automática completa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Introducir manualmente una detención completa punteando la barra espaciadora dos veces"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware del teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclado"
diff --git a/po/isfsetting_efl/et.po b/po/isfsetting_efl/et.po
deleted file mode 100644 (file)
index 6517a52..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Klaviatuuri valik"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Klaviatuuri seaded"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automaatne suur esitäht"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automaatne suur lause algustäht"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Lisa punkt automaatselt"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Sisestage automaatselt punkt, toksates kaks korda tühikuklahvi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Tarkvara klaviatuur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Riistvara klaviatuur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klahvistik"
diff --git a/po/isfsetting_efl/eu.po b/po/isfsetting_efl/eu.po
deleted file mode 100644 (file)
index 451e4a6..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Teklatu hautaketa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Teklatuaren ezarpenak"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Maiuskula jartze automatikoa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Jarri maiuskula automatikoki esaldiaren lehen letran"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Puntuatu automatikoki"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Puntua automatikoki gehitzeko, ukitu zuriune barra bi aldiz"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software teklatua"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware teklatua"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teklatua"
diff --git a/po/isfsetting_efl/fa.po b/po/isfsetting_efl/fa.po
deleted file mode 100644 (file)
index 7e9c4d1..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 15:22-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:595
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1208
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1283
-msgid "Keyboard settings"
-msgstr "تنظیمات صفحه کلید"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:896
-#: ism/extras/efl_setting/isf_setting_efl.cpp:972
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1186
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1263
-msgid "Keyboard selection"
-msgstr "انتخاب صفحه کلید"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1074
-msgid "Auto capitalization"
-msgstr "حروف بزرگ نویسی خودکار"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1097
-msgid "Automatically capitalize first letter of sentence"
-msgstr "اولین حرف جمله به طور خودکار بزرگ نوشته شود"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1122
-msgid "Automatic full stop"
-msgstr "نقطه خودكار"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1142
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "با دو بار ضربه زدن روی نوار فاصله در بالا، یک نقطه به طور خودکار اضافه شود"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1163
-msgid "Software keyboard"
-msgstr "صفحه کلید نرم افزار"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1232
-msgid "Hardware keyboard"
-msgstr "صفحه کلید سخت افزار"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1305
-msgid "Keyboard"
-msgstr "صفحه کلید"
diff --git a/po/isfsetting_efl/fi.po b/po/isfsetting_efl/fi.po
deleted file mode 100644 (file)
index b45efe8..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Näppäimistön valinta"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Näppäimistön asetukset"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automaattiset isot kirjaimet"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Käytä automaattisesti isoa kirjainta virkkeen alussa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automaattiset välimerkit"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Lisää piste automaattisesti napauttamalla välilyöntinäppäintä kaksi kertaa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Ohjelmistonäppäimistö"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Laitteistonäppäimistö"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Näppäimistö"
diff --git a/po/isfsetting_efl/fr_CA.po b/po/isfsetting_efl/fr_CA.po
deleted file mode 100644 (file)
index 4134044..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Sélection du clavier"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Paramètres du clavier"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Majuscules auto."
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Mettre automatiquement en majuscule la première lettre de la phrase"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Ponctuation automatique"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Insérer automatiquement un point en touchant deux fois la barre d'espace"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Clavier logiciel"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Clavier matériel"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Clavier"
diff --git a/po/isfsetting_efl/fr_FR.po b/po/isfsetting_efl/fr_FR.po
deleted file mode 100644 (file)
index f153a18..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Sélection du clavier"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Paramètres du clavier"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Majuscules auto."
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Mettre automatiquement en majuscule la première lettre de la phrase"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Ponctuation automatique"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr ""
-"Insérer automatiquement un point en appuyant deux fois sur la barre d'espace"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Clavier logiciel"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Clavier physique"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Clavier"
-
diff --git a/po/isfsetting_efl/ga.po b/po/isfsetting_efl/ga.po
deleted file mode 100644 (file)
index 82ac760..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Rogha eochairchláir"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Socruithe eochairchláir"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Maiúsculas de xeito automático"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Déan caipitliú uathoibríoch ar an gcéad litir den abairt"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Uathphoncaigh"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Ionsáigh lánstad go huathoibríoch trí thapáil faoi dhó ar an spásbharra"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Eochairchlár bogearraí"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Eochairchlár crua-earraí"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Eochairchlár"
diff --git a/po/isfsetting_efl/gl.po b/po/isfsetting_efl/gl.po
deleted file mode 100644 (file)
index e184081..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selección de teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Axustes do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Maiúsculas de xeito automático"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Pon a primeira letra das oracións en maiúscula automaticamente"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Puntuación automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Insire un punto final automaticamente pulsando a barra espazadora dúas veces"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Teclado de software"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Teclado de hardware"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclado"
diff --git a/po/isfsetting_efl/hi.po b/po/isfsetting_efl/hi.po
deleted file mode 100644 (file)
index 59878fc..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "कीबोर्ड चयन"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "कीबोर्ड सेटिंग"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "ऑटो कैपिटैलाइझेशन"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "स्वचालित रूप से वाक्य का पहला अक्षर कॅपिटल करें"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "स्वत: विराम"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "दो बार अन्तरक टैप करने से स्वचालित रूप से पूर्ण विराम लगाएं"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "सॉफ़्टवेयर कीबोर्ड"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "हार्डवेयर कीबोर्ड"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "की-बोर्ड"
diff --git a/po/isfsetting_efl/hr.po b/po/isfsetting_efl/hr.po
deleted file mode 100644 (file)
index 14c59eb..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Odabir tipkovnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Postavke tipkovnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Auto. veliko početno slovo"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Auto. veliko slovo na početku rečenice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Auto. interpunkcija"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Auto. umetanje točke dvostrukim dodirom tipke za razmak"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softverska tipkovnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardverska tipkovnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tipkovnica"
diff --git a/po/isfsetting_efl/hu.po b/po/isfsetting_efl/hu.po
deleted file mode 100644 (file)
index 50e9afe..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Billentyűzet kiválasztása"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Billentyűzet beállításai"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatikus nagybetűs mondatkezdés"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatikus nagybetűs mondatkezdés"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatikus központozás"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "A szóköz gomb kétszeri megérintésével automatikusan beszúrhat egy pontot"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Szoftveres billentyűzet"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardveres billentyűzet"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Billentyűzet"
diff --git a/po/isfsetting_efl/hy.po b/po/isfsetting_efl/hy.po
deleted file mode 100644 (file)
index 715c891..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Ստեղնաշարի ընտրություն"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Ստեղնաշարի դրվածքներ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Ինքնաբերական մեծատառ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Ինքնաբերաբար մեծատառ դարձնել նախադասության առաջին տառը"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Ինքնաբերաբար կետադրել"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Ինքնաբերաբար մտցնել վերջակետ՝ բացատի ստեղնը երկու անգամ թակելով"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Ծրագրակազմի ստեղնաշար"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Սարքակազմի ստեղնաշար"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Ստեղնաշար"
diff --git a/po/isfsetting_efl/is.po b/po/isfsetting_efl/is.po
deleted file mode 100644 (file)
index e00864c..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Val á lyklaborði"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Stillingar lyklaborðs"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Sjálfvirkir hástafir"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Setja sjálfkrafa hástaf í fyrsta orð í setningu"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Sjálfv. greinamerkjasetn."
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Setja sjálfkrafa inn punkt með því að pikka tvisvar á bilstöngina"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Hugbúnaðarlyklaborð"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Vélbúnaðarlyklaborð"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Lyklaborð"
diff --git a/po/isfsetting_efl/isfsetting-efl.pot b/po/isfsetting_efl/isfsetting-efl.pot
deleted file mode 100644 (file)
index d3999eb..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr ""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr ""
diff --git a/po/isfsetting_efl/it_IT.po b/po/isfsetting_efl/it_IT.po
deleted file mode 100644 (file)
index c0bffa1..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selezione tastiera"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Impostazioni tastiera"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Maiuscole auto"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Inserisce automaticamente la maiuscola all'inizio della frase"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Punteggiatura automatica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr ""
-"Inserisci automaticamente un punto toccando due volte la barra spaziatrice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Tastiera su schermo"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Tastiera hardware"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastiera"
-
diff --git a/po/isfsetting_efl/ja_JP.po b/po/isfsetting_efl/ja_JP.po
deleted file mode 100644 (file)
index 2e3c43d..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "キーボードを選択"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "キーボード設定"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "自動大文字変換"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "文頭文字を大文字に自動変換"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "自動句読点挿入"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "スペースバーのダブルタップでピリオドを自動入力"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "ソフトウェアキーボード"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "ハードウェアキーボード"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "キーボード"
-
diff --git a/po/isfsetting_efl/ka.po b/po/isfsetting_efl/ka.po
deleted file mode 100644 (file)
index 4f6ec60..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "კლავიატურის არჩევა"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "კლავიატურის პარამეტრები"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "ავტომატურად დაწყება ასომთავრულით"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "წინადადების პირველი ასოს ავტომატური შეცვლა ასომთავრულით"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "ავტომატური პუნქტუაცია"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "ინტერვალის ზოლზე ორჯერ დაკაკუნებით ავტომატურად დასვამთ წერტილს"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "პროგრამული კლავიატურა"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "ფიზიკური კლავიატურა"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "კლავიატურა"
diff --git a/po/isfsetting_efl/kk.po b/po/isfsetting_efl/kk.po
deleted file mode 100644 (file)
index f546e19..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Пернетақта таңдау"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Пернетақта параметрлері"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Бас әріптерді автоматты қолдану"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Сөйлемнің бірінші әрпін автоматты түрде бас әріппен жазу"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Авто тыныс белгі қою"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Бос орны пернесін екі рет түрту арқылы автоматты түрде нүкте енгізіңіз"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Бағдарламалық құрал пернетақтасы"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Аппараттық құрал пернетақтасы"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Пернетақта"
diff --git a/po/isfsetting_efl/ko_KR.po b/po/isfsetting_efl/ko_KR.po
deleted file mode 100644 (file)
index caeb1be..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# translation of ko.
-# Copyright (C) 2004 THE ko'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the ko package.
-#
-# Kitae <bluetux@gmail.com>, 2005.
-# Choe Hwanjin <choe.hwanjin@gmail.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: SCIM\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: 2005-07-08 18:16+0900\n"
-"Last-Translator: Choe Hwanjin <choe.hwanjin@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"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "키보드 선택"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "키보드 설정"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "자동 대문자 입력"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "문장의 첫 글자를 자동으로 대문자로 변환합니다"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "자동 구두점 입력"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "스페이스 바를 두 번 누르면 마침표를 자동으로 삽입합니다"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "소프트웨어 키보드"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "하드웨어 키보드"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "키보드"
-
diff --git a/po/isfsetting_efl/lt.po b/po/isfsetting_efl/lt.po
deleted file mode 100644 (file)
index 5bb2031..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Klaviatūros pasirinkimas"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Klaviatūros nustatymai"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatinis rašymas iš didžiosios raidės"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatiškai pradėti sakinį didžiąja raide"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Aut. įterpti skyr.ženklus"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automatiškai įterpti tašką dukart bakstelėjus tarpo mygtuką"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Programinės įrangos klaviatūra"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Aparatinė klaviatūra"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klaviatūra"
diff --git a/po/isfsetting_efl/lv.po b/po/isfsetting_efl/lv.po
deleted file mode 100644 (file)
index c9313c6..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Tastatūras izvēle"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Tastatūras iestatījumi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automātiska lielo burtu aktivizēšana"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automātiski sākt teikumu ar lielo burtu"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automātiskās pieturzīmes"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Pieskaroties divas reizes atstarpes taustiņam, automātiski ievietot punktu"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Programmatūras tastatūra"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Aparatūras tastatūra"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatūra"
diff --git a/po/isfsetting_efl/mk.po b/po/isfsetting_efl/mk.po
deleted file mode 100644 (file)
index 565f6f9..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Одбирање тастатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Нагодувања за тастатурата"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Автоматска прва голема буква"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Автоматска голема прва буква на речениците"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Автоматска интерпункција"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Автоматско внесување точка со притискање на разделникот двапати"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Софтверска тастатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Физичка тастатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Тастатура"
diff --git a/po/isfsetting_efl/nb.po b/po/isfsetting_efl/nb.po
deleted file mode 100644 (file)
index 4fd454c..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Tastaturvalg"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Tastaturinnstillinger"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatisk stor forbokstav"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Bruk automatisk stor bokstav i første bokstav i setninger"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatisk tegnsetting"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Sett automatisk inn et punktum ved å trykke to ganger på mellomromstasten"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Programvaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Maskinvaretastatur"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatur"
diff --git a/po/isfsetting_efl/nl_NL.po b/po/isfsetting_efl/nl_NL.po
deleted file mode 100644 (file)
index 2e79646..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Toetsenbordselectie"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Toetsenbordinstellingen"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatisch hoofdletters"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatische beginhoofdletter van zin"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatische interpunctie"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Voeg automatisch een punt in door tweemaal op de spatiebalk te tikken"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softwaretoetsenbord"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardwaretoetsenbord"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Toetsenbord"
-
diff --git a/po/isfsetting_efl/pl.po b/po/isfsetting_efl/pl.po
deleted file mode 100644 (file)
index 897176b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Wybór klawiatury"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Ustawienia klawiatury"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatyczne wielkie litery"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatycznie rozpoczynaj zdania od wielkiej litery"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatyczna interpunkcja"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Wstaw kropkę automatycznie, dotykając dwukrotnie klawisz spacji"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Klawiatura programowa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Klawiatura sprzętowa"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klawiatura"
diff --git a/po/isfsetting_efl/pt_BR.po b/po/isfsetting_efl/pt_BR.po
deleted file mode 100644 (file)
index 24b3bf4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Seleção do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Configurações do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Maiúscula e Minúscula automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Transformar a primeira letra da frase em maiúscula"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Pontuação automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Inserir automaticamente um ponto final tocando duas vezes na barra de espaços"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Software do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardware do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclado"
diff --git a/po/isfsetting_efl/pt_PT.po b/po/isfsetting_efl/pt_PT.po
deleted file mode 100644 (file)
index 24325ab..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selecção de teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Definições do teclado"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Capitalização automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Aplicar automaticamente letra maiúscula no início da frase"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Pontuação automática"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr ""
-"Inserir automaticamente um ponto final tocando duas vezes na barra de espaços"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Teclado virtual"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Teclado físico"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Teclado"
-
diff --git a/po/isfsetting_efl/ro.po b/po/isfsetting_efl/ro.po
deleted file mode 100644 (file)
index 5cbcea3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Selectare tastatură"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Setări tastatură"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Majusculă automată"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Introducere automată majusculă pentru prima literă din propoziţie"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Introd. autom. punctuaţie"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Introduceţi automat semnul punct atingând de două ori bara de spaţiu"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Tastatură software"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Tastatură hardware"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatură"
diff --git a/po/isfsetting_efl/ru_RU.po b/po/isfsetting_efl/ru_RU.po
deleted file mode 100644 (file)
index 9eaf835..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Выбор клавиатуры" 
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Параметры клавиатуры"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Заглавные буквы"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Автоматически делать первые буквы в предложениях заглавными"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Автоматическая пунктуация"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Автоматическая вставка точки после двойного нажатия клавиши \"пробел\""
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Программная клавиатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Физическая клавиатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Клавиатура"
diff --git a/po/isfsetting_efl/sk.po b/po/isfsetting_efl/sk.po
deleted file mode 100644 (file)
index 591127f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Výber klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Nastavenia klávesnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatická kapitalizácia"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automaticky nastaviť veľké písmeno na začiatku vety"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatická interpunkcia"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automaticky vložiť bodku dvojitým ťuknutím na medzerník"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softvérová klávesnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardvérová klávesnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klávesnica"
diff --git a/po/isfsetting_efl/sl.po b/po/isfsetting_efl/sl.po
deleted file mode 100644 (file)
index 764b1ab..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Izbira tipkovnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Nastavitve tipkovnice"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Samodejno pisanje z veliko začetnico"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Samodejno popravi veliko začetnico na začetku stavka"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Samodejno dodaj ločila"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Samodejno vnese piko, če dvakrat pritisnete preslednico"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Programska tipkovnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Strojna tipkovnica"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tipkovnica"
diff --git a/po/isfsetting_efl/sr.po b/po/isfsetting_efl/sr.po
deleted file mode 100644 (file)
index caa9ef0..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Izbor tastature" 
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Podešavanja tastature"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Automatska velika slova"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Automatski napiši prvo veliko slovo u rečenici"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatska interpunkcija"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Automatski ubaci tačku pritiskanjem razmaknice dvaput"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Softverska tastatura"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Hardverska tastatura"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tastatura"
diff --git a/po/isfsetting_efl/sv.po b/po/isfsetting_efl/sv.po
deleted file mode 100644 (file)
index d31f3a2..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Tangentbordsval"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Tangentbordsinställningar"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Stor bokstav automatiskt"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Inled automatiskt första bokstaven i en mening med versal"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Automatisk interpunktion"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Infoga automatiskt punkt genom att trycka två gånger på mellanslag"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Programvarutangentbord"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Maskinvarutangentbord"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Tangentbord"
diff --git a/po/isfsetting_efl/th.po b/po/isfsetting_efl/th.po
deleted file mode 100644 (file)
index 6d750e4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 15:22-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:595
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1208
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1283
-msgid "Keyboard settings"
-msgstr "การตั้งค่าแป้นพิมพ์"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:896
-#: ism/extras/efl_setting/isf_setting_efl.cpp:972
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1186
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1263
-msgid "Keyboard selection"
-msgstr "การเลือกแป้นพิมพ์"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1074
-msgid "Auto capitalization"
-msgstr "ปรับเป็นตัวพิมพ์ใหญ่อัตโนมัติ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1097
-msgid "Automatically capitalize first letter of sentence"
-msgstr "ให้ตัวอักษรตัวแรกของประโยคเป็นตัวพิมพ์ใหญ่อัตโนมัติ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1122
-msgid "Automatic full stop"
-msgstr "ใส่จุดอัตโนมัติ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1142
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "ใส่เครื่องหมายฟูลสต็อป (.) อัตโนมัติโดยการเคาะที่ปุ่มสเปซบาร์สองครั้ง"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1163
-msgid "Software keyboard"
-msgstr "แป้นพิมพ์ของซอฟต์แวร์"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1232
-msgid "Hardware keyboard"
-msgstr "แป้นพิมพ์ของฮาร์ดแวร์"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1305
-msgid "Keyboard"
-msgstr "แป้นพิมพ์"
diff --git a/po/isfsetting_efl/tr_TR.po b/po/isfsetting_efl/tr_TR.po
deleted file mode 100644 (file)
index 6aab753..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Klavye seçimi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Klavye ayarları"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Otomatik büyük harf yapma"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Cümlenin ilk harfini otomatik olarak büyük harf yap"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Oto. noktalama"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Boşluk tuşuna iki kez basarak otomatik olarak bir nokta gir"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Yazılım klavyesi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Donanım klavyesi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klavye"
-
diff --git a/po/isfsetting_efl/uk.po b/po/isfsetting_efl/uk.po
deleted file mode 100644 (file)
index 878d919..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Вибір клавіатури"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Установки клавіатури"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Автовикористання великих літер"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Автоматично робити великою першу літеру речення"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Авт. розст. пунктуації"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Автоматичне вставлення крапки після подвійного натискання пробілу"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Програмна клавіатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Апаратна клавіатура"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Клавіатура"
diff --git a/po/isfsetting_efl/update-po.sh b/po/isfsetting_efl/update-po.sh
deleted file mode 100755 (executable)
index 01fbfa9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-PACKAGE=isfsetting-efl
-SRCROOT=../..
-POTFILES=POTFILES.in
-
-ALL_LINGUAS="hy az eu bg ca zh_CN zh_HK zh_TW hr cs da nl_NL en en_US et fi fr_FR gl ka de_DE el_GR hu is ga it_IT ja_JP kk ko_KR lv lt mk nb pl pt_PT pt_BR ro ru_RU sr sk sl es_ES es_US es_MX sv tr_TR uk uz ar zh_SG hi en_PH fr_CA fa th ur"
-
-XGETTEXT=/usr/bin/xgettext
-MSGMERGE=/usr/bin/msgmerge
-
-echo -n "Make ${PACKAGE}.pot  "
-if [ ! -e $POTFILES ] ; then
-       echo "$POTFILES not found"
-       exit 1
-fi
-
-$XGETTEXT --default-domain=${PACKAGE} --directory=${SRCROOT} \
-               --add-comments --keyword=_ --keyword=_T --files-from=$POTFILES \
-&& test ! -f ${PACKAGE}.po \
-       || (rm -f ${PACKAGE}.pot && mv ${PACKAGE}.po ${PACKAGE}.pot)
-
-if [ $? -ne 0 ]; then
-       echo "error"
-       exit 1
-else
-       echo "done"
-fi
-
-for LANG in $ALL_LINGUAS; do 
-       echo "$LANG : "
-
-       if [ ! -e $LANG.po ] ; then
-               cp ${PACKAGE}.pot ${LANG}.po
-               echo "${LANG}.po created"
-       else
-               if $MSGMERGE ${LANG}.po ${PACKAGE}.pot -o ${LANG}.new.po ; then
-                       if cmp ${LANG}.po ${LANG}.new.po > /dev/null 2>&1; then
-                               rm -f ${LANG}.new.po
-                       else
-                               if mv -f ${LANG}.new.po ${LANG}.po; then
-                                       echo "" 
-                               else
-                                       echo "msgmerge for $LANG.po failed: cannot move $LANG.new.po to $LANG.po" 1>&2
-                                       rm -f ${LANG}.new.po
-                                       exit 1
-                               fi
-                       fi
-               else
-                       echo "msgmerge for $LANG failed!"
-                       rm -f ${LANG}.new.po
-               fi
-       fi
-       echo ""
-done
-
diff --git a/po/isfsetting_efl/ur.po b/po/isfsetting_efl/ur.po
deleted file mode 100644 (file)
index 13590b9..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 15:22-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:595
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1208
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1283
-msgid "Keyboard settings"
-msgstr "کیی بورڈ سیٹنگیں"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:896
-#: ism/extras/efl_setting/isf_setting_efl.cpp:972
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1186
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1263
-msgid "Keyboard selection"
-msgstr "کی بورڈ انتخاب"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1074
-msgid "Auto capitalization"
-msgstr "خودکار بڑے حرف لکھنا"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1097
-msgid "Automatically capitalize first letter of sentence"
-msgstr "جملہ کا پہلا حرف خودکار طور پر بڑا لکھنا"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1122
-msgid "Automatic full stop"
-msgstr "خودکار فل اسٹاپ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1142
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "اسپیس بار کو دو مرتبہ تھپک کر خودکار طور پر فل اسٹاپ داخل کریں"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1163
-msgid "Software keyboard"
-msgstr "سافٹ ویئر کی بورڈ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1232
-msgid "Hardware keyboard"
-msgstr "ہارڈ ویئر کی بورڈ"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1305
-msgid "Keyboard"
-msgstr "کی بورڈ"
diff --git a/po/isfsetting_efl/uz.po b/po/isfsetting_efl/uz.po
deleted file mode 100644 (file)
index 6b20da4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "Klaviatura tanlovi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "Klaviatura parametrlari"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "Avt. bosh harflar bilan boshlash"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "Gapning birinchi harfini avtomatik ravishda kattalashtirish"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "Tinish belgini avto-qo‘y"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "Bo‘shliq tugmasini ikki marta chertish orqali nuqtani avtomatik ravishda kiriting"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "Dasturiy ta’minot klaviaturasi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "Apparat klaviaturasi"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "Klaviatura"
diff --git a/po/isfsetting_efl/zh_CN.po b/po/isfsetting_efl/zh_CN.po
deleted file mode 100644 (file)
index 583b9da..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-# translation of zh_CN.po to Simplified Chinese
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zh_CN\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: 2011-01-01 14:57+0800\n"
-"Last-Translator: Haifeng Deng <haifeng.deng@samsung.com>\n"
-"Language-Team: Simplified 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"
-"X-Generator: KBabel 1.3.1\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "键盘选择"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "键盘设置"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "自动大写"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "句首字母自动大写"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "自动标点"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "点击空格栏两次以自动插入句号"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "软件键盘"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "硬件键盘"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "键盘"
-
diff --git a/po/isfsetting_efl/zh_HK.po b/po/isfsetting_efl/zh_HK.po
deleted file mode 100644 (file)
index 48b6de4..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# translation of zh_HK.po to Chinese (Hongkong)
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ISF 2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: 2011-01-01 22:41+0800\n"
-"Last-Translator: Haifeng Deng <haifeng.deng@samsung.com>\n"
-"Language-Team: scim@freedesktop.org\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "鍵盤選擇"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "鍵盤設定"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "自動大寫"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "句首字母自動大寫"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "自動標點"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "輕觸空格鍵兩次以自動插入句號"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "虛擬鍵盤"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "硬體鍵盤"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "鍵盤"
-
diff --git a/po/isfsetting_efl/zh_SG.po b/po/isfsetting_efl/zh_SG.po
deleted file mode 100644 (file)
index 5d19ce3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "键盘选择"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "键盘设置"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "自动大写"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "句首字母自动大写"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "自动标点"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "点击空格栏两次以自动插入句号"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "软件键盘"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "硬件键盘"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "键盘"
diff --git a/po/isfsetting_efl/zh_TW.po b/po/isfsetting_efl/zh_TW.po
deleted file mode 100644 (file)
index 7b5e8f2..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# translation of zh_TW.po to Chinese (Taiwan)
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ISF 2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-13 16:23+0800\n"
-"PO-Revision-Date: 2011-01-01 22:41+0800\n"
-"Last-Translator: Haifeng Deng <haifeng.deng@samsung.com>\n"
-"Language-Team: scim@freedesktop.org\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Push the layout along with function buttons and title
-#: ism/extras/efl_setting/isf_setting_efl.cpp:567
-#: ism/extras/efl_setting/isf_setting_efl.cpp:721
-#: ism/extras/efl_setting/isf_setting_efl.cpp:957
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1029
-msgid "Keyboard selection"
-msgstr "鍵盤選擇"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:654
-#: ism/extras/efl_setting/isf_setting_efl.cpp:978
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1048
-msgid "Keyboard settings"
-msgstr "鍵盤設定"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:846
-msgid "Auto capitalization"
-msgstr "自動擷取"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:866
-msgid "Automatically capitalize first letter of sentence"
-msgstr "句首字母自動大寫"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:899
-msgid "Automatic full stop"
-msgstr "自動斷句"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:916
-msgid "Automatically insert a full stop by tapping the space bar twice"
-msgstr "插入逗號請輕觸空格鍵兩次"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:934
-msgid "Software keyboard"
-msgstr "螢幕小鍵盤"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:998
-msgid "Hardware keyboard"
-msgstr "硬體鍵盤"
-
-#: ism/extras/efl_setting/isf_setting_efl.cpp:1079
-msgid "Keyboard"
-msgstr "鍵盤"
-
index 9cd0e69..ae55017 100755 (executable)
@@ -43,7 +43,6 @@ ism/modules/frontend/scim_socket_frontend.cpp
 ism/modules/imengine/scim_socket_imengine.cpp
 ism/extras/gtk2_immodule/gtkimcontextscim.cpp
 ism/extras/gtk2_immodule/imscim.cpp
-ism/extras/gtk_panel/scim_panel_gtk.cpp
 ism/extras/efl_panel/isf_panel_efl.cpp
 ism/utils/scimstringview.c
 ism/utils/scimkeyselection.cpp
index c18add9..8d7d534 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "تحديد طريقة الإدخال"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "إعداد طرق الإدخال"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "تم تحديد %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "يتوفر %s فقط"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "تم اكتشاف الإدخال من لوحة مفاتيح الجهاز"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "انقر لاستخدام لوحة المفاتيح الظاهرية"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "تم تفعيل لوحة المفاتيح الظاهرية"
index c18add9..be41ee3 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Daxiletmə üslnu seç"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Daxiletmə üsullarını qur"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seçildi"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Yalnız %s mümkündür"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Avdanlıq klaviaturasından daxiletmə aşkarlanması"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Virtual klaviatura istifadə etmək üçün vur"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtual klaviatura aktivləşdirildi"
index c18add9..49c0f52 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Избор метод въвежд."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Настройване на методи за въвеждане"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s избрани"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Налично е само %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Вход открит от хардуерна клавиатура"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Чукнете, за да използвате виртуална клавиатура"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Виртуалната клавиатура е активирана"
index c18add9..1999747 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Sel mètode d'entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar mètodes d'entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seleccionat"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Només %s disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Entrada detectada des del teclat hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toqui per utilitzar el teclat virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclat virtual habilitat"
index c18add9..81c1cc6 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Zvolte met. zadávání"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Nastavit způsoby zadávání"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Vybráno %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "K dispozici je pouze %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Rozpoznáno zadání z hardwarové klávesnice"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Klepnutím zapnete virtuální klávesnici"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuální klávesnice je zapnutá"
index c18add9..b583e8b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Vælg indtastningsmetode"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Konfigurér indtastningsmetoder"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s valgt"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Kun %s tilgængelig"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Input registreret fra hardwaretastatur"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tryk for at bruge virtuelt tastatur"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuelt tastatur aktiveret"
index 5c7a196..59d6ff7 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-12-16 14:10+0100\n"
 "Last-Translator: Jan Hefti <j.hefti@chinaboard.de>\n"
 "Language-Team: German <scim-devel@lists.sourceforge.net>\n"
@@ -20,763 +20,719 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "Deutsch Tastatur"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
-#, fuzzy
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
-msgstr "Englisch (USA)"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "Arabisch"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "Arabisch (Ägypten)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "Assamesisch"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "Bengalisch"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "Bengalisch (Indien)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "Tibetisch"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "Bosnisch"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "Walisisch"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "Englisch (Australien)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "Englisch (Kanada)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "Englisch (Großbritannien)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "Englisch (Irland)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "Englisch (USA)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "Spanisch (Mexiko)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Persisch"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "Irisch"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "Hebräisch"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "Hindi"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "Interlingua"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "Indonesisch"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "Japanisch"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "Kambodschanisch"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "Laotisch"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "Mazedonisch"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "Malajalam"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "Mongolisch"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "Marathi"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "Malaysisch"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "Nepalesisch"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 #, fuzzy
 msgid "Norwegian (Nynorsk)"
 msgstr "Norwegisch (Nynorsk)"
 
-#: ism/src/scim_utility.cpp:768
-#, fuzzy
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "Norwegisch (Bokmal)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "Orija"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "Pandschabi"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "Albanisch"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "Serbisch"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "Schwedisch (Finnland)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "Tamilisch"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "Thai"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "Uigurisch"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "Urdu"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "Usbekisch"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "Vietnamesisch"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "Wallonisch"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "Jiddisch"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 #, fuzzy
 msgid "Chinese (Simplified)"
 msgstr "Chinesisch (vereinfacht)"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 #, fuzzy
 msgid "Chinese (Hongkong)"
 msgstr "Chinesisch (traditionell)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 #, fuzzy
 msgid "Chinese (Traditional)"
 msgstr "Chinesisch (traditionell)"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 #, fuzzy
 msgid "Dutch (Belgian)"
 msgstr "Belgisch"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 #, fuzzy
 msgid "English (New Zealand)"
 msgstr "Englisch (Irland)"
 
-#: ism/src/scim_utility.cpp:812
-#, fuzzy
-msgid "English (Irish)"
-msgstr "Englisch (Großbritannien)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 #, fuzzy
 msgid "English (South Africa)"
 msgstr "Englisch (USA)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 #, fuzzy
 msgid "English (Jamaica)"
 msgstr "Englisch (Kanada)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 #, fuzzy
 msgid "English (Belize)"
 msgstr "Englisch (Großbritannien)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 #, fuzzy
 msgid "English (Trinidad)"
 msgstr "Englisch (Großbritannien)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 #, fuzzy
 msgid "English (Zimbabwe)"
 msgstr "Englisch (Kanada)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 #, fuzzy
 msgid "English (Philippines)"
 msgstr "Englisch (Großbritannien)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 #, fuzzy
 msgid "French (Belgian)"
 msgstr "Französisch (Kanada)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 #, fuzzy
 msgid "French (Swiss)"
 msgstr "Deutsch (Schweiz)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 #, fuzzy
 msgid "French (Monaco)"
 msgstr "Französisch (Kanada)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "Deutsch (Schweiz)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 #, fuzzy
 msgid "German (Austrian)"
 msgstr "Englisch (Australien)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 #, fuzzy
 msgid "German (Liechtenstein)"
 msgstr "Deutsch (Schweiz)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 #, fuzzy
 msgid "Italian (Swiss)"
 msgstr "Deutsch (Schweiz)"
 
-#: ism/src/scim_utility.cpp:832
-#, fuzzy
-msgid "Portuguese (Brazilian)"
-msgstr "Portugiesisch (Brasilien)"
-
-#: ism/src/scim_utility.cpp:834
-#, fuzzy
-msgid "Spanish (Traditional Sort)"
-msgstr "Spanisch (Lateinamerika)"
-
-#: ism/src/scim_utility.cpp:835
-#, fuzzy
-msgid "Spanish (Mexican)"
-msgstr "Spanisch (Mexiko)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 #, fuzzy
 msgid "Spanish (Guatemala)"
 msgstr "Spanisch (Lateinamerika)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 #, fuzzy
 msgid "Spanish (Costa Rica)"
 msgstr "Spanisch (Lateinamerika)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 #, fuzzy
 msgid "Spanish (Panama)"
 msgstr "Spanisch (Lateinamerika)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 #, fuzzy
 msgid "Spanish (Dominican Republic)"
 msgstr "Spanisch (Lateinamerika)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 #, fuzzy
 msgid "Spanish (Venezuela)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 #, fuzzy
 msgid "Spanish (Colombia)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 #, fuzzy
 msgid "Spanish (Peru)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 #, fuzzy
 msgid "Spanish (Argentina)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 #, fuzzy
 msgid "Spanish (Ecuador)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 #, fuzzy
 msgid "Spanish (Chile)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 #, fuzzy
 msgid "Spanish (Uruguay)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 #, fuzzy
 msgid "Spanish (Paraguay)"
 msgstr "Spanisch (CP 850)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 #, fuzzy
 msgid "Spanish (Bolivia)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 #, fuzzy
 msgid "Spanish (Honduras)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 #, fuzzy
 msgid "Spanish (Nicaragua)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 #, fuzzy
 msgid "Spanish (Puerto Rico)"
 msgstr "Spanisch (Mexiko)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:859
-#, fuzzy
-msgid "Malay (Malaysia)"
-msgstr "Malajalam"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "Norwegisch"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-#, fuzzy
-msgid "Chinese (Taiwan)"
-msgstr "Chinesisch (traditionell)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "Chinesisch (traditionell)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 #, fuzzy
 msgid "Chinese (Macau)"
 msgstr "Chinesisch (traditionell)"
 
-#: ism/src/scim_utility.cpp:888
-#, fuzzy
-msgid "Chinese (PRC)"
-msgstr "Chinesisch"
-
-#: ism/src/scim_utility.cpp:889
-#, fuzzy
-msgid "Chinese (Singapore)"
-msgstr "Chinesisch (vereinfacht)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 #, fuzzy
 msgid "Arabic (Iraq)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 #, fuzzy
 msgid "Arabic (Libya)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 #, fuzzy
 msgid "Arabic (Algeria)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 #, fuzzy
 msgid "Arabic (Morocco)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 #, fuzzy
 msgid "Arabic (Tunisia)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 #, fuzzy
 msgid "Arabic (Oman)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 #, fuzzy
 msgid "Arabic (Yemen)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 #, fuzzy
 msgid "Arabic (Syria)"
 msgstr "Arabisch (Ägypten)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 #, fuzzy
 msgid "Arabic (Jordan)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 #, fuzzy
 msgid "Arabic (Kuwait)"
 msgstr "Arabisch (Ägypten)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 #, fuzzy
 msgid "Arabic (UAE)"
 msgstr "Arabisch (Ägypten)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 #, fuzzy
 msgid "Arabic (Bahrain)"
 msgstr "Arabisch (Libanon)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 #, fuzzy
 msgid "Arabic (Qatar)"
 msgstr "Arabisch (Ägypten)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "Sonstige"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -816,10 +772,6 @@ msgstr "Slovakisch (qwerty)"
 msgid "Spanish (CP 850)"
 msgstr "Spanisch (CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "Spanisch (Lateinamerika)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "Englisch (UK)"
@@ -877,11 +829,11 @@ msgstr "VC->TC"
 msgid "TC->SC"
 msgstr "TC->VC"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "Smart Common Input Method Plattform "
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -891,7 +843,7 @@ msgstr ""
 "(c) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -899,7 +851,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -907,15 +859,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "Aktivieren"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Eingabemethode"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Eingabemethoden einrichten"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s ausgewählt"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Nur %s verfügbar."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Eingabe von der Hardwaretastatur erkannt"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tippen, um virtuelle Tastatur zu verwenden"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1097,621 +1080,196 @@ msgid "The orientation of the tray."
 msgstr "Die Ausrichtung des Systemabschnitts der Kontrollleiste."
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-#, fuzzy
-msgid "Next"
-msgstr "Text"
-
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#~ msgid "English/European"
-#~ msgstr "Deutsch/Europäisch"
-
-#~ msgid "RAW CODE"
-#~ msgstr "Unicode Rohdaten"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(c) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "Tastenkürzel:\n"
-#~ "\n"
-#~ "  Steuerung+u:\n"
-#~ "    Umschalten zwischen Multibyte-Codierung und Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    Eingabemethode zurücksetzen.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr ""
-#~ "Der Status der aktuell verwendeten Eingabemethode. Klicken Sie diesen an, "
-#~ "um ihn zu ändern."
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "Globale Einstellungen"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "Stellen Sie die globalen Optionen ein, die von allen FrontEnd-Modulen "
-#~ "beachtet werden, einschließlich dem X11 FrontEnd, GKT IMModule, QT "
-#~ "IMModule, usw."
-
-#~ msgid "_Trigger:"
-#~ msgstr "_Auslöser:"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "Tasten zum Auslösen auswählen"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen die Eingabemethode SCIM an- und "
-#~ "ausgeschaltet wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "Turn _On:"
-#~ msgstr "_Einschalten:"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "Tasten zum Einschalten auswählen"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen die Eingabemethode SCIM eingeschaltet "
-#~ "wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "A_usschalten"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "Tasten zum Ausschalten auswählen"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen die Eingabemethode SCIM ausgeschaltet "
-#~ "wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "_Next input method:"
-#~ msgstr "_Nächste Eingabemethode:"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr ""
-#~ "Wählen Sie die Tastenkombinationen, um zur nächsten Eingabemethode zu "
-#~ "wechseln"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen zur nächsten Eingabemethode gewechselt "
-#~ "wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "_Vorherige Eingabemethode:"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr ""
-#~ "Wählen Sie die Tastenkombinationen, um zur vorherigen Eingabemethode zu "
-#~ "wechseln"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen zur vorherigen Eingabemethode gewechselt "
-#~ "wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "Zeige _Auswahlmenü für Eingabemethoden:"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr ""
-#~ "Wählen Sie die Tastenkürzel, um das Auswahlmenü für Eingabemethoden "
-#~ "anzuzeigen"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Tastenkombinationen, mit denen das Auswahlmenü für Eingabemethoden "
-#~ "angezeigt wird. Klicken Sie zum Ändern auf den rechten Knopf."
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "_Tastaturlayout"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "Sie sollten hier Ihr derzeit verwendetes Tastaturlayout einstellen, so "
-#~ "dass Eingabemethoden, die vom Tastaturlayout abhängig sind, korrekt "
-#~ "funktionieren."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "Roheingabe ins Client-Fenster einbetten"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird die Roheingabe - die bisher "
-#~ "eingegebenen Zeichen vor einer endgültigen Auswahl - ins Client-"
-#~ "Eingabefenster eingebettet und nicht in einem Extrafenster angezeigt."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "Dieselbe Eingabemethode unter _allen Anwendungen verwenden."
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "Wenn diese Option aktiviert ist, wird ein und dieselbe Eingabemethode von "
-#~ "allen Anwendungen gleichzeitig verwendet. Andernfalls kann jede Anwendung "
-#~ "eine andere Eingabemethode verwenden."
-
-#~ msgid "Hotkeys"
-#~ msgstr "Tastenkombinationen"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr ""
-#~ "Hier können Sie die installierten Eingabemethoden aktivieren/deaktivieren "
-#~ "und ihnen Tastenkürzel zuordnen."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "Installierte Eingabemethoden:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "_Tastenkürzel ändern"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr ""
-#~ "Stellen Sie die mit der gewählten Eingabemethode assoziierten "
-#~ "Tastenkürzel ein."
-
-#~ msgid "Select _Filters"
-#~ msgstr "_Filter auswählen"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr ""
-#~ "Wählen Sie die Filter, die dieser Eingabemethode zugeordnet werden sollen."
-
-#~ msgid "_Expand"
-#~ msgstr "Er_weitern"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "Erweitern Sie alle Sprachgruppen."
-
-#~ msgid "_Collapse"
-#~ msgstr "Ein_klappen"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "Klappen Sie alle Sprachgruppen ein."
-
-#~ msgid "E_nable All"
-#~ msgstr "Alle _aktivieren"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "Alle Eingabemethoden aktivieren."
-
-#~ msgid "_Disable All"
-#~ msgstr "Alle _deaktivieren"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "Alle Eingabemethoden deaktivieren."
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Languages"
-#~ msgstr "Sprachen"
-
-#~ msgid "Description"
-#~ msgstr "Beschreibung"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "Tastenkürzel für %s ändern"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "Filter für %s wählen"
-
-#~ msgid "Move _Up"
-#~ msgstr "Nach _oben"
-
-#~ msgid "Move _Down"
-#~ msgstr "Nach _unten"
-
-#~ msgid "GTK"
-#~ msgstr "GTK"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr ""
-#~ "Ein Kontrollleisten-Hilfsprogramm, das auf der GTK+-2.x-Bibliothek beruht."
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
+msgstr ""
 
-#~ msgid "On demand"
-#~ msgstr "Auf Anforderung"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid "Never"
-#~ msgstr "Nie"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid "ToolBar"
-#~ msgstr "Symbolleiste"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "_Show:"
-#~ msgstr "_Zeige:"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Auto s_nap"
-#~ msgstr "Automatisch ein_rasten"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "Show _input method icon"
-#~ msgstr "Symbol für die Eingabe_methode anzeigen"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Show inp_ut method name"
-#~ msgstr "_Name der Eingabemethode anzeigen"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Hide time_out:"
-#~ msgstr "_Ausblenden nach (sek):"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "Show s_tick icon"
-#~ msgstr "Symbol »Immer im _Vordergrund« anzeigen"
+#~ msgid "English (British)"
+#~ msgstr "Englisch (Großbritannien)"
 
-#~ msgid "Show m_enu icon"
-#~ msgstr "Symbol »_Menü« anzeigen"
+#~ msgid "English (American)"
+#~ msgstr "Englisch (USA)"
 
-#~ msgid "Show _help icon"
-#~ msgstr "Symbol »_Hilfe« anzeigen"
+#, fuzzy
+#~ msgid "English (Irish)"
+#~ msgstr "Englisch (Großbritannien)"
 
-#~ msgid "Show _property label"
-#~ msgstr "_Bezeichnung der Eigenschaften anzeigen"
+#, fuzzy
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugiesisch (Brasilien)"
 
-#~ msgid "Input window"
-#~ msgstr "Eingabefenster"
+#, fuzzy
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "Malajalam"
 
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "Ein_gebettete Auswahlliste"
+#, fuzzy
+#~ msgid "Chinese (PRC)"
+#~ msgstr "Chinesisch"
 
-#~ msgid "_Vertical lookup table"
-#~ msgstr "_Vertikale Auswahlliste"
-
-#~ msgid "Misc"
-#~ msgstr "Verschiedenes"
+#, fuzzy
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "Chinesisch (vereinfacht)"
 
-#~ msgid "Show tra_y icon"
-#~ msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
-
-#~ msgid "Stick _windows"
-#~ msgstr "Fenster behält _Position"
-
-#~ msgid "_Font:"
-#~ msgstr "_Schriftart:"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "Wenn »Immer« gewählt ist, wird die Symbolleiste immer auf dem Bildschirm "
-#~ "angezeigt. Bei »Auf Anforderung« wird sie nur angezeigt, wenn SCIM "
-#~ "aktiviert ist. Bei »Nie« wird sie niemals angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird die Symbolleiste am Bildschirmrand "
-#~ "eingerastet."
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "Die Symbolleiste wird versteckt, nachdem die angegebene Zeit vergangen "
-#~ "ist. Diese Option ist nur verfügbar, wenn »Immer anzeigen« gewählt ist. "
-#~ "Geben Sie »0« ein, um dieses Verhalten zu unterdrücken. "
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird das Symbol der aktuellen "
-#~ "Eingabemethode auf der Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird der Name der aktuellen Eingabemethode "
-#~ "auf der Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird das Symbol »Immer im Vordergrund "
-#~ "halten« auf der Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird das Symbol »Menü« auf der "
-#~ "Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird das Symbol »Hilfe« auf der "
-#~ "Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, werden die Bezeichnungen der einzelnen "
-#~ "Eigenschaften der Eingabemethode auf der Symbolleiste angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird die Auswahlliste ins Eingabefenster "
-#~ "eingebettet."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird die Auswahlliste senkrecht angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, wird ein Symbol in der Kontrollleiste "
-#~ "angezeigt."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr ""
-#~ "Wenn diese Option gewählt ist, werden Symbolleiste, Eingabefenster und "
-#~ "Auswahlliste immer an ihren jeweiligen Ausgangspositionen gehalten."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr ""
-#~ "Die eingestellte Schriftart wird in Eingabefenster und Auswahlliste "
-#~ "verwendet."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "Schriftart für die Benutzeroberfläche wählen"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "Benutzeroberfläche"
-
-#~ msgid "IMEngine"
-#~ msgstr "Eingabemethoden"
-
-#~ msgid "Panel"
-#~ msgstr "Kontrollleiste"
-
-#~ msgid "Extra"
-#~ msgstr "Extra"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "Einstellungen der SCIM-Eingabemethoden"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">Smart Common Input Method-Plattform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">Grafisches Einrichtungswerkzeug</"
-#~ "span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">Einstellungen der %s-Module.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "Möchten Sie die Einstellung von SCIM wirklich verlassen?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "Nicht alle Einstellungen können bei laufendem Programm neu geladen "
-#~ "werden. Starten Sie bitte SCIM neu, damit alle Änderungen übernommen "
-#~ "werden."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "Einrichtung von SCIM"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr ""
-#~ "Integriertes Einrichtungswerkzeug, das auf der GTK Widget-Bibliothek "
-#~ "beruht."
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "Einrichtungswerkzeug für die Smart Common Input Method-Plattform"
-
-#~ msgid "SCIM Help"
-#~ msgstr "Hilfe zu SCIM"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "Smart Common Input Method"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "Eingabefenster und Symbolleiste festsetzen/verschiebbar machen."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "Zeige eine kurze Hilfe zu SCIM und zur gewählten Eingabemethode."
-
-#~ msgid "Show command menu."
-#~ msgstr "Befehlsmenü anzeigen."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(c) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid "Reload Configuration"
-#~ msgstr "Einstellungen neu laden"
-
-#~ msgid "Stick Windows"
-#~ msgstr "Werkzeugleiste festsetzen"
+#, fuzzy
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "Chinesisch (traditionell)"
 
-#~ msgid "Hide Toolbar"
-#~ msgstr "Symbolleiste verstecken"
-
-#~ msgid "Help ..."
-#~ msgstr "Hilfe ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "Chinesisch (traditionell)"
 
-#~ msgid "Exit"
-#~ msgstr "Beenden"
+#, fuzzy
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "Spanisch (Lateinamerika)"
 
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+#, fuzzy
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "Spanisch (Mexiko)"
 
-#~ msgid "En"
-#~ msgstr "De"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuelle Tastatur aktiviert"
index c18add9..0bad3a8 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Επιλ.μεθ.εισαγωγής"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Ρύθμιση μεθόδων εισαγωγής"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Επιλέχθηκε το %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Μόνο ο μηχανισμός %s είναι διαθέσιμος"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Εντοπίστηκαν δεδομένα εισόδου από πληκτρολόγιο υλικού"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Πατήστε για να χρησιμοποιήσετε το εικονικό πληκτρολόγιο"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Το εικονικό πληκτρολόγιο ενεργοποιήθηκε"
index 1dedee5..485fed9 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Farsi"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Select input method"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Set up input methods"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s selected"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Only %s available"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Input detected from hardware keyboard"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tap to use virtual keyboard"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtual keyboard enabled"
index c18add9..485fed9 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Select input method"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Set up input methods"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s selected"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Only %s available"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Input detected from hardware keyboard"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tap to use virtual keyboard"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtual keyboard enabled"
index 1dedee5..e59f480 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Farsi"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Select input method"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Set up input methods"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s selected"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Only %s available"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Input detected from hardware keyboard"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tap to use virtual keyboard"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtual keyboard is on"
index c18add9..0f14ec3 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Seleccionar método de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Se ha seleccionado %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Sólo %s disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Se ha detectado introducción desde el teclado de hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Pulse para usar el teclado virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclado virtual activado"
index fc0ca65..d460ad2 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 16:42+0800\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,696 +17,663 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:765
-#: ism/src/scim_panel_agent.cpp:369 ism/src/scim_panel_agent.cpp:3817
-#: ism/src/scim_utility.cpp:706
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1716
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:709 ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:711
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:712 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714 ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:715 ism/src/scim_utility.cpp:716
-#: ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:717
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:718
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:719
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:858
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:721 ism/src/scim_utility.cpp:868
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:928
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:723 ism/src/scim_utility.cpp:859
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:829
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:725
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:728 ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:730
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:732
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:735
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:875
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:857
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:738
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:862
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:823
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:744 ism/src/scim_utility.cpp:753
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:745 ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:746 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:748
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:749
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:750
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:861
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:834
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:754 ism/src/scim_utility.cpp:887
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:756 ism/src/scim_utility.cpp:880
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:757
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:758
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:888
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:760
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:761 ism/src/scim_utility.cpp:877
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:763 ism/src/scim_utility.cpp:881
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:764 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:809
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:771
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:772
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:773
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:774 ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:778
-#: ism/src/scim_utility.cpp:837 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:871
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:780 ism/src/scim_utility.cpp:882
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:782 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:783 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:784
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:787
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:790
-#: ism/src/scim_utility.cpp:866 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:791 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:794 ism/src/scim_utility.cpp:885
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:795
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796 ism/src/scim_utility.cpp:884
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:799 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:800
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:804 ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:805
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:811
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:812
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:819
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:825 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:826
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:830 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:833
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:835
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:836
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:838
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:839
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:855
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:863
-msgid "Malay (Malaysia)"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:864
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:883
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:886
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:890
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:892
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:893
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:929
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:930
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:931
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1029
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1666
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1668
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1674
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1677
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:969
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Seleccionar método de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:990
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Se ha seleccionado %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Sólo %s disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Entrada detectada desde el teclado del hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Pulse para usar el teclado virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,109 +1010,136 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:220
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:220
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:224
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:224
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:228
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:228
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:232
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:232
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
 #. Terminal Layout
-#: ism/demos/isf_layout_efl.cpp:236
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:236
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "click to enter TERMINAL"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:256
+#: ism/demos/isf_layout_efl.cpp:304
 msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:169
-msgid "Previous"
-msgstr ""
-
-#. service_add_extra_data (ad->data, "navi_btn_left", NULL);
 #: ism/demos/isf_demo_efl.cpp:171
-msgid "Next"
-msgstr ""
-
-#: ism/demos/isf_demo_efl.cpp:200
 msgid "ISF Demo"
 msgstr ""
 
@@ -1130,10 +1151,13 @@ msgstr ""
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:261
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclado virtual activado"
index c18add9..cdd812f 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,37 +778,68 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Seleccionar método de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Se ha seleccionado %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Sólo %s disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
 msgstr ""
 
 #: ism/utils/scimstringview.c:201
@@ -1016,115 +1010,151 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
index c18add9..12a6ec1 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Valige sisestusviis"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Seadista sisestusmeetodid"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s valitud"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Saadaval on ainult %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Riistvara klaviatuurilt on tuvastatud sisestus"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toksake, et kasutada virtuaalset klaviatuuri"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuaalne klaviatuur on aktiveeritud"
index c18add9..c158a62 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Hautatu sar. metodoa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Ezarri idazkera metodoak"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s aukeratuta"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "%s soilik eskuragarri"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Hardware teklatuko sarrera hautemanda"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Ukitu teklatu birtuala erabiltzeko"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teklatu birtuala gaituta"
index 788bc2c..6baf443 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 13:04-0400\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:765
-#: ism/src/scim_panel_agent.cpp:370 ism/src/scim_panel_agent.cpp:3843
-#: ism/src/scim_utility.cpp:706
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
@@ -29,692 +29,651 @@ msgstr ""
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:709 ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:711
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:712 ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714 ism/src/scim_utility.cpp:882
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:715 ism/src/scim_utility.cpp:716
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:717
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:718
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:719
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:861
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:721 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:931
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:723 ism/src/scim_utility.cpp:862
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:832
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:725
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:728 ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:730
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:732
-msgid "English (American)"
-msgstr ""
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:733
+#: ism/src/scim_utility.cpp:811
 msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:734 ism/src/scim_utility.cpp:735
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:736
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:739
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:826
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_utility.cpp:929
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:744 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:745 ism/src/scim_utility.cpp:754
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:872
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:749
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:750
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:751
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:753 ism/src/scim_utility.cpp:837
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:890
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:756 ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:883
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:758
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:759
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:763 ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:764 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:765 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:767 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:770
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:812
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:772
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:773
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:774
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:779
-#: ism/src/scim_utility.cpp:840 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:780 ism/src/scim_utility.cpp:874
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:885
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:782 ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
 msgid "Sindhi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:930
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:876
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:786 ism/src/scim_utility.cpp:877
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:787
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:789
-#: ism/src/scim_utility.cpp:790
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:791 ism/src/scim_utility.cpp:793
-#: ism/src/scim_utility.cpp:869 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:870
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796 ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:888
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799 ism/src/scim_utility.cpp:887
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:802 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:804 ism/src/scim_utility.cpp:805
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:808
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:815
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:819
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:825
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:830
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:834
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:835
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:841
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:842
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:855
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:857
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:858
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:866
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:886
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:889
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:893
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:896
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:928
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:932
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:933
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:934
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1032
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
@@ -762,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -823,51 +778,67 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:969
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:990
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:389
-msgid "Virtual keyboard is on"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:422
-#: ism/extras/efl_panel/isf_panel_efl.cpp:488
-#: ism/extras/efl_panel/isf_panel_efl.cpp:499
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
 msgid "Input detected from hardware keyboard"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:430
-#: ism/extras/efl_panel/isf_panel_efl.cpp:493
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
 msgid "Tap to use virtual keyboard"
 msgstr ""
 
@@ -1039,145 +1010,136 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
 #. Number Only with signed Layout
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
 #. Number Only with decimal Layout
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
 #. Number Only with signed and decimal Layout
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
 #. Datetime Layout
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "click to enter DATETIME"
 msgstr ""
 
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
 #. Terminal Layout
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "click to enter TERMINAL"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:289
+#: ism/demos/isf_layout_efl.cpp:304
 msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:170
-msgid "Previous"
-msgstr ""
-
-#. service_add_extra_data (ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:172
-msgid "Next"
-msgstr ""
-
-#: ism/demos/isf_demo_efl.cpp:201
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
index c18add9..af8c83b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Valitse syöttötapa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Määritä syöttötavat"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s valittu"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Vain %s käytettävissä"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Laitenäppäimistöltä havaittu syöte"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Napauta tätä, jos haluat käyttää virtuaalista näppäimistöä"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuaalinen näppäimistö käytössä"
index c18add9..ea34a9f 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Mode de saisie"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurer les modes de saisie"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s sélectionné"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "%s uniquement disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Saisie détectée sur le clavier matériel"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Touchez pour utiliser le clavier tactile"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Clavier tactile activé"
index 642a1bf..00b0e13 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-12-11 13:54+0800\n"
 "Last-Translator: Damien Menanteau <MengDaming@nerdshack.com>\n"
 "Language-Team: French\n"
@@ -18,763 +18,719 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "Clavier Français"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
-#, fuzzy
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
-msgstr "Anglais (Etats-Unis)"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "Arabe"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "Arabe (Egypte)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "Assamais"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "Bengali"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "Bengali (Inde)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "Tibétain"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "Bosniaque"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "Gallois"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr "Maldivien"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "Anglais (Australie)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "Anglais (Canada)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "Anglais (Royaume Uni)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "Anglais (Irlande)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "Anglais (Etats-Unis)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "Espagnol (Mexique)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Perse"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "Irlandais"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "Hébreu"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "Hindou"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "Interlingua"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "Indonésien"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "Japonais"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "Khmer"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "Kannara"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "Laotien"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "Macédonien"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "Mongol"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "Marathi"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "Malais"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "Birman"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 #, fuzzy
 msgid "Norwegian (Nynorsk)"
 msgstr "Norvégien (Nynorsk)"
 
-#: ism/src/scim_utility.cpp:768
-#, fuzzy
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "Norvégien (Bokmal)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "Singhalais"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "Albanais"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "Serbe"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "Suédois (Finlande)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "Tamoul"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "Thaï"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "Uighur"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "Ourdou"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "Ouzbèque"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "Vietnamien"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "Wallon"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "Yiddish"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 #, fuzzy
 msgid "Chinese (Simplified)"
 msgstr "Chinois (simplifié)"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 #, fuzzy
 msgid "Chinese (Hongkong)"
 msgstr "Chinois (traditionnel)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 #, fuzzy
 msgid "Chinese (Traditional)"
 msgstr "Chinois (traditionnel)"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 #, fuzzy
 msgid "Dutch (Belgian)"
 msgstr "Belge"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 #, fuzzy
 msgid "English (New Zealand)"
 msgstr "Anglais (Irlande)"
 
-#: ism/src/scim_utility.cpp:812
-#, fuzzy
-msgid "English (Irish)"
-msgstr "Anglais (Royaume Uni)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 #, fuzzy
 msgid "English (South Africa)"
 msgstr "Anglais (Etats-Unis)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 #, fuzzy
 msgid "English (Jamaica)"
 msgstr "Anglais (Canada)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 #, fuzzy
 msgid "English (Belize)"
 msgstr "Anglais (Royaume Uni)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 #, fuzzy
 msgid "English (Trinidad)"
 msgstr "Anglais (Royaume Uni)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 #, fuzzy
 msgid "English (Zimbabwe)"
 msgstr "Anglais (Canada)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 #, fuzzy
 msgid "English (Philippines)"
 msgstr "Anglais (Royaume Uni)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 #, fuzzy
 msgid "French (Belgian)"
 msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 #, fuzzy
 msgid "French (Swiss)"
 msgstr "Allemand (Suisse)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 #, fuzzy
 msgid "French (Monaco)"
 msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "Allemand (Suisse)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 #, fuzzy
 msgid "German (Austrian)"
 msgstr "Anglais (Australie)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 #, fuzzy
 msgid "German (Liechtenstein)"
 msgstr "Allemand (Suisse)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 #, fuzzy
 msgid "Italian (Swiss)"
 msgstr "Allemand (Suisse)"
 
-#: ism/src/scim_utility.cpp:832
-#, fuzzy
-msgid "Portuguese (Brazilian)"
-msgstr "Portugais (Brésil)"
-
-#: ism/src/scim_utility.cpp:834
-#, fuzzy
-msgid "Spanish (Traditional Sort)"
-msgstr "Espagnol (Amérique latine)"
-
-#: ism/src/scim_utility.cpp:835
-#, fuzzy
-msgid "Spanish (Mexican)"
-msgstr "Espagnol (Mexique)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 #, fuzzy
 msgid "Spanish (Guatemala)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 #, fuzzy
 msgid "Spanish (Costa Rica)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 #, fuzzy
 msgid "Spanish (Panama)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 #, fuzzy
 msgid "Spanish (Dominican Republic)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 #, fuzzy
 msgid "Spanish (Venezuela)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 #, fuzzy
 msgid "Spanish (Colombia)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 #, fuzzy
 msgid "Spanish (Peru)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 #, fuzzy
 msgid "Spanish (Argentina)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 #, fuzzy
 msgid "Spanish (Ecuador)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 #, fuzzy
 msgid "Spanish (Chile)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 #, fuzzy
 msgid "Spanish (Uruguay)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 #, fuzzy
 msgid "Spanish (Paraguay)"
 msgstr "Espagnol (CP 850)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 #, fuzzy
 msgid "Spanish (Bolivia)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 #, fuzzy
 msgid "Spanish (Honduras)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 #, fuzzy
 msgid "Spanish (Nicaragua)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 #, fuzzy
 msgid "Spanish (Puerto Rico)"
 msgstr "Espagnol (Mexique)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:859
-#, fuzzy
-msgid "Malay (Malaysia)"
-msgstr "Malayalam"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "Norvégien"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-#, fuzzy
-msgid "Chinese (Taiwan)"
-msgstr "Chinois (traditionnel)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "Chinois (traditionnel)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 #, fuzzy
 msgid "Chinese (Macau)"
 msgstr "Chinois (traditionnel)"
 
-#: ism/src/scim_utility.cpp:888
-#, fuzzy
-msgid "Chinese (PRC)"
-msgstr "Chinois"
-
-#: ism/src/scim_utility.cpp:889
-#, fuzzy
-msgid "Chinese (Singapore)"
-msgstr "Chinois (simplifié)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 #, fuzzy
 msgid "Arabic (Iraq)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 #, fuzzy
 msgid "Arabic (Libya)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 #, fuzzy
 msgid "Arabic (Algeria)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 #, fuzzy
 msgid "Arabic (Morocco)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 #, fuzzy
 msgid "Arabic (Tunisia)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 #, fuzzy
 msgid "Arabic (Oman)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 #, fuzzy
 msgid "Arabic (Yemen)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 #, fuzzy
 msgid "Arabic (Syria)"
 msgstr "Arabe (Egypte)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 #, fuzzy
 msgid "Arabic (Jordan)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 #, fuzzy
 msgid "Arabic (Kuwait)"
 msgstr "Arabe (Egypte)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 #, fuzzy
 msgid "Arabic (UAE)"
 msgstr "Arabe (Egypte)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 #, fuzzy
 msgid "Arabic (Bahrain)"
 msgstr "Arabe (Liban)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 #, fuzzy
 msgid "Arabic (Qatar)"
 msgstr "Arabe (Egypte)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "Autre"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -814,10 +770,6 @@ msgstr "Slovaque (qwerty)"
 msgid "Spanish (CP 850)"
 msgstr "Espagnol (CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "Espagnol (Amérique latine)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "Anglais (GB)"
@@ -875,11 +827,11 @@ msgstr "CS->CT"
 msgid "TC->SC"
 msgstr "CT->CS"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "Plateforme Smart Common Input Method"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -889,7 +841,7 @@ msgstr ""
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -897,7 +849,7 @@ msgstr ""
 " :\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -905,15 +857,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "Activer"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Mode de saisie"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurer les modes de saisie"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s sélectionné"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "Nom"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "%s uniquement disponible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Saisie détectée sur le clavier matériel"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Appuyez pour utiliser le clavier virtuel"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1098,612 +1081,196 @@ msgid "The orientation of the tray."
 msgstr "Orientation du tiroir."
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-#, fuzzy
-msgid "Next"
-msgstr "Texte"
-
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#~ msgid "English/European"
-#~ msgstr "Français/Européen"
-
-#~ msgid "RAW CODE"
-#~ msgstr "CODE BRUT"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "Racourcis :\n"
-#~ "\n"
-#~ "  Ctrl+u :\n"
-#~ "    bascule entre encodage Multi-octets et Unicode.\n"
-#~ "\n"
-#~ "  Echap :\n"
-#~ "    réinitialise la méthode de saisie.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "Etat de la méthode de saisie courante. Cliquer pour la modifier."
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "Configuration globale"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "Configurer des options globales utilisées par tous les modules frontaux, "
-#~ "incluant le frontal X11, GTK IMModule, QT IMModule etc."
-
-#~ msgid "_Trigger:"
-#~ msgstr "_Déclencheur :"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "Sélectionner les touches d'activation"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Touches pour activer/désactiver SCIM. Cliquer sur le bouton de droite "
-#~ "pour les modifier."
-
-#~ msgid "Turn _On:"
-#~ msgstr "_Activer:"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "Sélectionner les touches d'activation"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Touches pour activer SCIM. Cliquer sur le bouton de droite pour les "
-#~ "modifier."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "Désac_tiver:"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "Sélectionner les touches de désactivation"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Touches pour désactiver SCIM. Cliquer sur le bouton de droite pour les "
-#~ "modifier."
-
-#~ msgid "_Next input method:"
-#~ msgstr "Méthode de saisie _Suivante :"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "Sélectionner les touches pour la méthode de saisie suivante"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Touches pour aller à la méthode de saisie suivante. Cliquer sur le bouton "
-#~ "de droite pour les modifier."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "Méthode de saisie _Précédente :"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "Sélectionner les touches pour la méthode de saisie précédente"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "Touches pour revenir à la méthode de saisie précédente. Cliquer sur le "
-#~ "bouton de droite pour les modifier."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "Accès au _Menu des méthodes de saisie :"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr ""
-#~ "Sélectionner les touches pour accéder au menu des méthodes de saisie"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Touches pour accéder au menu des méthodes de saisie. Cliquer sur le "
-#~ "bouton de droite pour les modifier."
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "_Type de Clavier:"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "Indiquez ici le type de clavier que vous utilisez afin que les méthodes "
-#~ "de saisie qui dépendent du type de clavier puissent fonctionner "
-#~ "correctement."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "Insérer les chaîne en préédition dans la fenêtre cliente"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, la table de préédition est affichée "
-#~ "directement dans la fenêtre de saisie, et non pas dans une fenêtre "
-#~ "indépendante."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "_Partage de la même méthode de saisie entre toutes les applications"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, la même méthode de saisie peut être "
-#~ "utilisée par toutes les applications en même temps. Dans le cas "
-#~ "contraire, chaque application utilise sa propre méthode de saisie."
-
-#~ msgid "Hotkeys"
-#~ msgstr "Raccourcis"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr ""
-#~ "Ici, vous pouvez activer/désactiver les méthodes de saisie et les jeux de "
-#~ "raccourcis pour les méthodes de saisie."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "Services de méthode de saisie installés :"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "Editer les _Raccourcis"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "Editer les raccourcis associés à la méthode de saisie sélectionnée."
-
-#~ msgid "Select _Filters"
-#~ msgstr "Sélectionner les _Filtres"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "Sélectionner les Filtres à associer à cette méthode de saisie."
-
-#~ msgid "_Expand"
-#~ msgstr "_Ouvrir"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "Ouvrir toutes les catégories de langage."
-
-#~ msgid "_Collapse"
-#~ msgstr "_Refermer"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "Fermer toutes les catégories de langage."
-
-#~ msgid "E_nable All"
-#~ msgstr "Tout Activer"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "Activer toutes les méthodes de saisie."
-
-#~ msgid "_Disable All"
-#~ msgstr "Tout Désactiver"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "Désactiver toutes les méthodes de saisie."
-
-#~ msgid "Filters"
-#~ msgstr "Filtres"
-
-#~ msgid "Languages"
-#~ msgstr "Langues"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "Editer les raccourcis pour %s"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "Sélectionner les filtres pour %s"
-
-#~ msgid "Move _Up"
-#~ msgstr "_Monter"
-
-#~ msgid "Move _Down"
-#~ msgstr "_Descendre"
-
-#~ msgid "GTK"
-#~ msgstr "GTK"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "Un panneau serveur basé sur la librairie GTK+-2.x."
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
+msgstr ""
 
-#~ msgid "On demand"
-#~ msgstr "A la demande"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid "Never"
-#~ msgstr "Jamais"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid "ToolBar"
-#~ msgstr "Barre d'Outils"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "_Show:"
-#~ msgstr "_Afficher"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Auto s_nap"
-#~ msgstr "Aligne_ment automatique"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "Show _input method icon"
-#~ msgstr "Affichage icône méthode de _saisie"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Show inp_ut method name"
-#~ msgstr "Affichage _nom méthode de saisie"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Hide time_out:"
-#~ msgstr "_Délai avant masquage :"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "Show s_tick icon"
-#~ msgstr "Affichage icône d'épin_glage fenêtre"
+#~ msgid "English (British)"
+#~ msgstr "Anglais (Royaume Uni)"
 
-#~ msgid "Show m_enu icon"
-#~ msgstr "Afficher l'icône de m_enu"
+#~ msgid "English (American)"
+#~ msgstr "Anglais (Etats-Unis)"
 
-#~ msgid "Show _help icon"
-#~ msgstr "Affichage icône d'_aide"
+#, fuzzy
+#~ msgid "English (Irish)"
+#~ msgstr "Anglais (Royaume Uni)"
 
-#~ msgid "Show _property label"
-#~ msgstr "Affichage label de p_ropriété"
+#, fuzzy
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugais (Brésil)"
 
-#~ msgid "Input window"
-#~ msgstr "Fenêtre de saisie"
+#, fuzzy
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "Malayalam"
 
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "Table de recherche _embarquée"
+#, fuzzy
+#~ msgid "Chinese (PRC)"
+#~ msgstr "Chinois"
 
-#~ msgid "_Vertical lookup table"
-#~ msgstr "Table de recherche _verticale"
+#, fuzzy
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "Chinois (simplifié)"
 
-#~ msgid "Misc"
-#~ msgstr "Divers"
-
-#~ msgid "Show tra_y icon"
-#~ msgstr "Affichage icône barre de _tâches"
-
-#~ msgid "Stick _windows"
-#~ msgstr "Epinglage _fenêtres"
-
-#~ msgid "_Font:"
-#~ msgstr "P_olice :"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "Quand l'option \"Toujours\" est sélectionnée, la barre d'outils est "
-#~ "affichée en permanence à l'écran. Quand l'option \"A la demande\" est "
-#~ "sélectionnée, la barre d'outils est affichée uniquement lorsque SCIM est "
-#~ "activé. Quand l'option \"Jamais\" estsélectionnée, la barre d'outils "
-#~ "n'est jamais affichée."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, la barre d'outil s'aligne "
-#~ "automatiquement sur le bord de l'écran."
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "La barre d'outils sera masquée automatiquement après l'expiration de ce "
-#~ "délai. Cette option n'est valide que si l'option \"Afficher Toujours\" "
-#~ "est sélectionnée. Une valeur de délai de 0 supprime ce comportement."
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, l'icône de la méthode de saisie est "
-#~ "inséré dans la barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, le nom de la méthode de saisie est "
-#~ "inséré dans la barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, l'icône d'épinglage de fenêtre est "
-#~ "inséré dans la barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, l'icône de menu est inséré dans la "
-#~ "barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, l'icône d'aide est inséré dans la "
-#~ "barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, le label des propriétés de la "
-#~ "méthode de saisie est inséré dans la barre d'outils."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, la table de recherche est embarquée "
-#~ "dans la fenêtre de saisie."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, la table de recherche est affichée "
-#~ "verticalement."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, l'icône est inséré dans la barre de "
-#~ "tâches du bureau."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr ""
-#~ "Quand cette option est sélectionnée, les fenêtres de saisie et de "
-#~ "recherche sont maintenues à leur position originale."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr ""
-#~ "La police de caractères configurée est utilisée dans les fenêtres de "
-#~ "saisie et de recherche."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "Police de Caractères"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "Interface"
-
-#~ msgid "IMEngine"
-#~ msgstr "Moteur de Saisie"
-
-#~ msgid "Panel"
-#~ msgstr "Panneau"
-
-#~ msgid "Extra"
-#~ msgstr "Extra"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "Configuration de la Méthode de Saisie SCIM"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">Plateforme Smart Common Input Method</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">Utilitaire de Configuration</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">Configuration des modules %s.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "Etes vous sûr de vouloir quitter SCIM Config. ?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "Certains des paramètres de configuration ne peuvent pas être pris en "
-#~ "compte automatiquement. N'oubliez pas de redémarrer SCIM afin que toutes "
-#~ "les nouvelles valeurs de configuration soient prises en compte."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "Configuration de SCIM"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr ""
-#~ "Utilitaire de configuration intégré basé sur la librairie GTK Widget."
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr ""
-#~ "Utilitaire de configuration de la plateforme \"Smart Common Input Method\""
-
-#~ msgid "SCIM Help"
-#~ msgstr "Aide SCIM"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "Smart Common Input Method"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "Epingle la fenêtre de saisie et la barre d'outils."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr ""
-#~ "Affiche une aide succincte sur SCIM et la méthode de saisie courante."
-
-#~ msgid "Show command menu."
-#~ msgstr "Afficher le menu des commandes."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid "Reload Configuration"
-#~ msgstr "Recharger la Configuration"
-
-#~ msgid "Stick Windows"
-#~ msgstr "Epingler les Fenêtres"
+#, fuzzy
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "Chinois (traditionnel)"
 
-#~ msgid "Hide Toolbar"
-#~ msgstr "Masquer la Barre d'Outils"
-
-#~ msgid "Help ..."
-#~ msgstr "Aide ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "Chinois (traditionnel)"
 
-#~ msgid "Exit"
-#~ msgstr "Quitter"
+#, fuzzy
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "Espagnol (Amérique latine)"
 
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+#, fuzzy
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "Espagnol (Mexique)"
 
-#~ msgid "En"
-#~ msgstr "Fr"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Clavier virtuel activé"
index c18add9..cc3ef26 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Pioc modh ionchuir"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Socraigh modhanna ionchuir"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s roghnaithe"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Níl ach %s ar fáil"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Ionchur braite ó eochairchlár crua-earraí"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tapáil le heochairchlár fíorúil a úsáid"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Eochairchlár fíorúil cumasaithe"
index c18add9..a18e633 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Selec. método entr."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de entrada"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seleccionados"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Só %s dispoñible"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Detectáronse datos introducidos desde o teclado de hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toca para usar o teclado virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclado virtual activado"
index c18add9..6f5076d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "भाषा इंडोनेशिया"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "इनपुट पद्धति चुनें"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "इनपुट पद्धति सेट अप करें"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s चुना गया"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "केवल %s उपलब्ध है"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "हार्डवेयर कीबोर्ड से इनपुट की पहचान हुई"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "वर्चुअल कीबोर्ड का उपयोग करने के लिए टैप करें"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "वर्चुअल कीबोर्ड सक्षम किया गया"
index c18add9..9ba607d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Odaberi način unosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Postavite načine unosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s odabrano"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Dostupan samo %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Hardverska tipkovnica prepoznala unos"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Dodirnite za korištenje virtualne tipkovnice"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Omogućena virtualna tipkovnica"
index c18add9..621ac4b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Beviteli mód váltás"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Beviteli módok beállítása"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s kiválasztva"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Csak a(z) %s elérhető"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Bevitel észlelve a hardveres billentyűzetről"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Érintse meg a virtuális billentyűzet használatához"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuális billentyűzet engedélyezve"
index c18add9..b0af08b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Ընտրել ներած. եղանակ"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Նախադրել ներածման եղանակներ"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s ընտրվեց"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Հասանելի է միայն %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Զետեղել սարքաշարային ստեղնաշարից բացահայտվածը"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Թակեք՝ վիրտուալ ստեղնաշարն օգտագործելու համար"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Վիրտուալ ստեղնաշարը միացված է"
index c18add9..3ac0ed8 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Innsláttaraðferð"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Setja upp innsláttaraðferðir"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s valið"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Aðeins %s er í boði"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Innsláttur frá vélbúnaðarlyklaborði greindist"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Pikkaðu til að nota sýndarlyklaborð"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Kveikt á sýndarlyklaborði"
index cc411ca..071ec90 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-12-13 00:36+0100\n"
 "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -20,766 +20,724 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "Inglese Tastiera"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 #, fuzzy
 msgid "English input service"
 msgstr "Inglese (americano)"
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "Amarico"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "Arabo"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "Arabo (Egitto)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "Assamese"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "Bengalese"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "Bengalese (India)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "Tibetano"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "Bosniaco"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "Gallese"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "Inglese (australiano)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "Inglese (canadese)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "Inglese (britannico)"
+#: ism/src/scim_utility.cpp:808
+#, fuzzy
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "Inglese (Irlanda)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "Inglese (americano)"
+#: ism/src/scim_utility.cpp:810
+#, fuzzy
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "Spagnolo (Messico)"
+msgstr "Español (México)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Persiano"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "Irlandese"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "Ebraico"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "Hindi"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 #, fuzzy
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "Interlingua"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "Indonesiano"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "Giapponese"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "Cambogiano"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "Laotiano"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "Macedone"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "Mongolo"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "Marathi"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "Malese"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 #, fuzzy
 msgid "Burmese"
-msgstr "Sfoglia"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "Nepalese"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 #, fuzzy
 msgid "Norwegian (Nynorsk)"
 msgstr "Norvegese (nynorsk)"
 
-#: ism/src/scim_utility.cpp:768
-#, fuzzy
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "Norvegese (bokmål)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "Albanese"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "Serbo"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "Svedese (Finlandia)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "Tailandese"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "Uighur"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "Urdu"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "Uzbeko"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "Vietnamita"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "Vallone"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "Yiddish"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 #, fuzzy
 msgid "Chinese (Simplified)"
 msgstr "Cinese (semplificato)"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 #, fuzzy
 msgid "Chinese (Hongkong)"
 msgstr "Cinese (tradizionale)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 #, fuzzy
 msgid "Chinese (Traditional)"
 msgstr "Cinese (tradizionale)"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 #, fuzzy
 msgid "Dutch (Belgian)"
 msgstr "Belga"
 
-#: ism/src/scim_utility.cpp:807
-#, fuzzy
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-#, fuzzy
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 #, fuzzy
 msgid "English (New Zealand)"
 msgstr "Inglese (Irlanda)"
 
-#: ism/src/scim_utility.cpp:812
-#, fuzzy
-msgid "English (Irish)"
-msgstr "Inglese (britannico)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 #, fuzzy
 msgid "English (South Africa)"
 msgstr "Inglese (americano)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 #, fuzzy
 msgid "English (Jamaica)"
 msgstr "Inglese (canadese)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 #, fuzzy
 msgid "English (Belize)"
 msgstr "Inglese (britannico)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 #, fuzzy
 msgid "English (Trinidad)"
 msgstr "Inglese (britannico)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 #, fuzzy
 msgid "English (Zimbabwe)"
 msgstr "Inglese (canadese)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 #, fuzzy
 msgid "English (Philippines)"
 msgstr "Inglese (britannico)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 #, fuzzy
 msgid "French (Belgian)"
 msgstr "Francese (canadese)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 #, fuzzy
 msgid "French (Swiss)"
 msgstr "Tedesco (svizzero)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 #, fuzzy
 msgid "French (Monaco)"
 msgstr "Francese (canadese)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "Tedesco (svizzero)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 #, fuzzy
 msgid "German (Austrian)"
 msgstr "Inglese (australiano)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 #, fuzzy
 msgid "German (Liechtenstein)"
 msgstr "Tedesco (svizzero)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 #, fuzzy
 msgid "Italian (Swiss)"
 msgstr "Tedesco (svizzero)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (brasiliano)"
-
-#: ism/src/scim_utility.cpp:834
-#, fuzzy
-msgid "Spanish (Traditional Sort)"
-msgstr "Spagnolo (America latina)"
-
-#: ism/src/scim_utility.cpp:835
-#, fuzzy
-msgid "Spanish (Mexican)"
-msgstr "Spagnolo (Messico)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 #, fuzzy
 msgid "Spanish (Guatemala)"
 msgstr "Spagnolo (America latina)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 #, fuzzy
 msgid "Spanish (Costa Rica)"
 msgstr "Spagnolo (America latina)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 #, fuzzy
 msgid "Spanish (Panama)"
 msgstr "Spagnolo (America latina)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 #, fuzzy
 msgid "Spanish (Dominican Republic)"
 msgstr "Spagnolo (America latina)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 #, fuzzy
 msgid "Spanish (Venezuela)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 #, fuzzy
 msgid "Spanish (Colombia)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 #, fuzzy
 msgid "Spanish (Peru)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 #, fuzzy
 msgid "Spanish (Argentina)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 #, fuzzy
 msgid "Spanish (Ecuador)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 #, fuzzy
 msgid "Spanish (Chile)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 #, fuzzy
 msgid "Spanish (Uruguay)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 #, fuzzy
 msgid "Spanish (Paraguay)"
 msgstr "Spagnolo (CP 850)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 #, fuzzy
 msgid "Spanish (Bolivia)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 #, fuzzy
 msgid "Spanish (Honduras)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 #, fuzzy
 msgid "Spanish (Nicaragua)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 #, fuzzy
 msgid "Spanish (Puerto Rico)"
 msgstr "Spagnolo (Messico)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:859
-#, fuzzy
-msgid "Malay (Malaysia)"
-msgstr "Malayalam"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "Norvegese"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-#, fuzzy
-msgid "Chinese (Taiwan)"
-msgstr "Cinese (tradizionale)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "Cinese (tradizionale)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 #, fuzzy
 msgid "Chinese (Macau)"
 msgstr "Cinese (tradizionale)"
 
-#: ism/src/scim_utility.cpp:888
-#, fuzzy
-msgid "Chinese (PRC)"
-msgstr "Cinese"
-
-#: ism/src/scim_utility.cpp:889
-#, fuzzy
-msgid "Chinese (Singapore)"
-msgstr "Cinese (semplificato)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 #, fuzzy
 msgid "Arabic (Iraq)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 #, fuzzy
 msgid "Arabic (Libya)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 #, fuzzy
 msgid "Arabic (Algeria)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 #, fuzzy
 msgid "Arabic (Morocco)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 #, fuzzy
 msgid "Arabic (Tunisia)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 #, fuzzy
 msgid "Arabic (Oman)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 #, fuzzy
 msgid "Arabic (Yemen)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 #, fuzzy
 msgid "Arabic (Syria)"
 msgstr "Arabo (Egitto)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 #, fuzzy
 msgid "Arabic (Jordan)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 #, fuzzy
 msgid "Arabic (Kuwait)"
 msgstr "Arabo (Egitto)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 #, fuzzy
 msgid "Arabic (UAE)"
 msgstr "Arabo (Egitto)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 #, fuzzy
 msgid "Arabic (Bahrain)"
 msgstr "Arabo (Libano)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 #, fuzzy
 msgid "Arabic (Qatar)"
 msgstr "Arabo (Egitto)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "Altro"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -819,10 +777,6 @@ msgstr "Slovacco (qwerty)"
 msgid "Spanish (CP 850)"
 msgstr "Spagnolo (CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "Spagnolo (America latina)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "Inglese (GB)"
@@ -880,11 +834,11 @@ msgstr "CS->CT"
 msgid "TC->SC"
 msgstr "CT->CS"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "Piattaforma del metodo intelligente di inserimento comune"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -894,7 +848,7 @@ msgstr ""
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -902,7 +856,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -910,15 +864,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "Abilita"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Modalità di inserimento"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Imposta metodi di inserimento"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "Nome"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s selezionato"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "È disponibile solo %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Inserimento rilevato dalla tastiera hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toccate per utilizzare la tastiera virtuale"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1100,1418 +1085,195 @@ msgid "The orientation of the tray."
 msgstr "L'orientazione del vassoio."
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-#, fuzzy
-msgid "Next"
-msgstr "Testo"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Selection"
-#~ msgstr "Selezione dei tasti"
-
-#, fuzzy
-#~ msgid "Option"
-#~ msgstr "Opzioni"
-
-#, fuzzy
-#~ msgid "Auto capitalization"
-#~ msgstr "Divisione automatica:"
-
-#, fuzzy
-#~ msgid "Auto period"
-#~ msgstr "Divisione automatica:"
-
-#, fuzzy
-#~ msgid "General"
-#~ msgstr "Generico"
+#~ msgid "English (British)"
+#~ msgstr "Inglese (britannico)"
 
-#, fuzzy
-#~ msgid "S/W keyboard"
-#~ msgstr "Inglese/Tastiera"
+#~ msgid "English (American)"
+#~ msgstr "Inglese (americano)"
 
 #, fuzzy
-#~ msgid "Keyboard selection"
-#~ msgstr "Selezione dei tasti"
+#~ msgid "English (Irish)"
+#~ msgstr "Inglese (britannico)"
 
-#, fuzzy
-#~ msgid "Keyboard option"
-#~ msgstr "Selezione dei tasti"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portoghese (brasiliano)"
 
 #, fuzzy
-#~ msgid "H/W keyboard"
-#~ msgstr "Inglese/Tastiera"
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "Malayalam"
 
 #, fuzzy
-#~ msgid "option"
-#~ msgstr "Opzioni"
+#~ msgid "Chinese (PRC)"
+#~ msgstr "Cinese"
 
 #, fuzzy
-#~ msgid "Keyboard"
-#~ msgstr "Inglese/Tastiera"
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "Cinese (semplificato)"
 
 #, fuzzy
-#~ msgid "Automatic"
-#~ msgstr "Amarico"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "Cinese (tradizionale)"
 
 #, fuzzy
-#~ msgid "Always used"
-#~ msgstr "Sempre"
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "Cinese (tradizionale)"
 
 #, fuzzy
-#~ msgid "%s Option"
-#~ msgstr "Opzioni"
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "Spagnolo (America latina)"
 
 #, fuzzy
-#~ msgid "Keyboards"
-#~ msgstr "Inglese/Tastiera"
-
-#~ msgid "English/European"
-#~ msgstr "Inglese/Europeo"
-
-#~ msgid "RAW CODE"
-#~ msgstr "CODICE GREZZO"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "Tasti rapidi:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    passa tra la codifica multibyte e Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reimposta il metodo di inserimento.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "Lo stato del metodo di inserimento attuale. Fai clic per cambiarlo."
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "Configurazione globale"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "Configura le opzioni globali usate da tutti i moduli di interfaccia, "
-#~ "inclusi l'interfaccia X11, i moduli di inserimento di GTK e QT, ecc."
-
-#~ msgid "_Trigger:"
-#~ msgstr "A_ttivatore:"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "Seleziona i tasti di attivazione"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per accendere o spegnere il metodo di "
-#~ "inserimento. Fai clic sul pulsante a destra per modificarle."
-
-#~ msgid "Turn _On:"
-#~ msgstr "_Accendi:"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "Seleziona i tasti di accensione"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per far partire il metodo di inserimento. Fai "
-#~ "clic sul pulsante a destra per modificarle."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "_Spegni:"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "Seleziona i tasti di spegnimento"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per far fermare il metodo di inserimento. Fai "
-#~ "clic sul pulsante a destra per modificarle."
-
-#~ msgid "_Next input method:"
-#~ msgstr "Metodo di i_nserimento successivo:"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "Seleziona i tasti del metodo di inserimento successivo"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per passare al metodo di inserimento successivo. "
-#~ "Fai clic sul pulsante a destra per modificarle."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "Metodo di inserimento _precedente:"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "Seleziona i tasti del metodo di inserimento precedente"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per passare al metodo di inserimento precedente. "
-#~ "Fai clic sul pulsante a destra per modificarle."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "_Mostra il menu del metodo di inserimento:"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "Seleziona i tasti del menu del metodo di inserimento"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per mostrare il menu del metodo di inserimento. "
-#~ "Fai clic sul pulsante sulla destra per modificarle."
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "Schema della _tastiera:"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "Dovresti scegliere qui la tastiera che usi adesso, in modo che i metodi "
-#~ "di inserimento, che ne dipendono, funzionino correttamente."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "Incorpora la pr_emodifica delle stringhe nella finestra del client"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la stringa di premodifica sarà visualizzata "
-#~ "direttamente nella finestra di inserimento del client, piuttosto che in "
-#~ "una finestra libera."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "Condividi lo _stesso metodo di inserimento in tutte le applicazioni"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, si potrà usare un solo metodo di inserimento "
-#~ "in tutte le applicazioni allo stesso tempo. Altrimenti, ogni applicazione "
-#~ "potrà usare un metodo di inserimento diverso."
-
-#~ msgid "Hotkeys"
-#~ msgstr "Tasti rapidi"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr ""
-#~ "Qui puoi abilitare o disabilitare i metodi di inserimento e impostare i "
-#~ "loro tasti rapidi."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "I servizi di metodo di inserimento installati:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "Modi_fica tasti rapidi"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr ""
-#~ "Modifica i tasti rapidi associati con il metodo di inserimento "
-#~ "selezionato."
-
-#~ msgid "Select _Filters"
-#~ msgstr "Seleziona _filtri"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr ""
-#~ "Seleziona i filtri che saranno allegati a questo metodo di inserimento."
-
-#~ msgid "_Expand"
-#~ msgstr "_Espandi"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "Espandi tutte le categorie delle lingue."
-
-#~ msgid "_Collapse"
-#~ msgstr "_Contrai"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "Contrai tutte le categorie delle lingue."
-
-#~ msgid "E_nable All"
-#~ msgstr "A_bilita tutti"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "Abilita tutti i metodi di inserimento."
-
-#~ msgid "_Disable All"
-#~ msgstr "_Disabilita tutti"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "Disabilita tutti i metodi di inserimento."
-
-#~ msgid "Filters"
-#~ msgstr "Filtri"
-
-#~ msgid "Languages"
-#~ msgstr "Lingue"
-
-#~ msgid "Description"
-#~ msgstr "Descrizione"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "Modifica i tasti rapidi per: %s"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "Seleziona i filtri per: %s"
-
-#~ msgid "Move _Up"
-#~ msgstr "Sposta in s_u"
-
-#~ msgid "Move _Down"
-#~ msgstr "Sposta in _giù"
-
-#~ msgid "GTK"
-#~ msgstr "GTK"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "Un demone di pannello basato sulle librerie GTK+-2.x."
-
-#~ msgid "On demand"
-#~ msgstr "A richiesta"
-
-#~ msgid "Never"
-#~ msgstr "Mai"
-
-#~ msgid "ToolBar"
-#~ msgstr "Barra degli strumenti"
-
-#~ msgid "_Show:"
-#~ msgstr "Mo_stra:"
-
-#~ msgid "Auto s_nap"
-#~ msgstr "Agga_ncia automaticamente"
-
-#~ msgid "Show _input method icon"
-#~ msgstr "Mostra icona del metodo di _inserimento"
-
-#~ msgid "Show inp_ut method name"
-#~ msgstr "Mostra nome del metodo di ins_erimento"
-
-#~ msgid "Hide time_out:"
-#~ msgstr "Nasc_ondi scadenza:"
-
-#~ msgid "Show s_tick icon"
-#~ msgstr "Mostra icona dell'agganciamen_to"
-
-#~ msgid "Show m_enu icon"
-#~ msgstr "Mostra icona del m_enu"
-
-#~ msgid "Show _help icon"
-#~ msgstr "Mostra icona dell'ai_uto"
-
-#~ msgid "Show _property label"
-#~ msgstr "Mostra etichetta delle _proprietà"
-
-#~ msgid "Input window"
-#~ msgstr "Finestra di inserimento"
-
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "Tabella di riferi_mento incorporata"
-
-#~ msgid "_Vertical lookup table"
-#~ msgstr "Tabella di riferimento _verticale"
-
-#~ msgid "Misc"
-#~ msgstr "Varie"
-
-#~ msgid "Show tra_y icon"
-#~ msgstr "Mostra icona del vasso_io"
-
-#~ msgid "Stick _windows"
-#~ msgstr "Aggancia _finestre"
-
-#~ msgid "_Font:"
-#~ msgstr "_Carattere:"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "Se l'opzione \"Sempre\" è segnata, la barra degli strumenti sarà sempre "
-#~ "visualizzata sullo schermo. Se è segnata l'opzione \"A richiesta\", sarà "
-#~ "mostrata solo quando viene attivato SCIM. Se è segnata l'opzione \"Mai\", "
-#~ "non sarà mai mostrata."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la barra degli strumenti sarà agganciata al "
-#~ "bordo dello schermo."
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "La barra degli strumenti sarà nascosta dopo che sarà passato questo "
-#~ "tempo. Questa opzione è valida solo quando \"Visualizza sempre\" è "
-#~ "segnato. Imposta a zero per disabilitare questo comportamento."
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'icona del metodo di inserimento sarà "
-#~ "mostrata nella barra degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, il nome del metodo di inserimento sarà "
-#~ "mostrato nella barra degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'icona dell'agganciamento sarà mostrata "
-#~ "sulla barra degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'icona del menu sarà mostrata nella barra "
-#~ "degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'icona dell'aiuto sarà mostrata nella barra "
-#~ "degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'etichetta di testo del metodo di "
-#~ "inserimento sarà mostrata nella barra degli strumenti."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la tabella di riferimento sarà incorporata "
-#~ "nella finestra di inserimento."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la tabella di riferimento sarà mostrata "
-#~ "verticalmente."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, l'icona del vassoio sarà mostrata nel "
-#~ "pannello del desktop."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la barra degli strumenti, le finestre di "
-#~ "inserimento e della tabella di riferimento saranno agganciate alla loro "
-#~ "posizione originale."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr ""
-#~ "L'impostazione del carattere sarà usata nelle finestre di inserimento e "
-#~ "della tabella di riferimento."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "Seleziona il carattere dell'interfaccia"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "Interfaccia"
-
-#~ msgid "IMEngine"
-#~ msgstr "IMEngine"
-
-#~ msgid "Panel"
-#~ msgstr "Pannello"
-
-#~ msgid "Extra"
-#~ msgstr "Extra"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "Configurazione del metodo di inserimento SCIM"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ "<span size=\"20000\">Piattaforma del metodo di inserimento comune "
-#~ "intelligente</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">Programma di configurazione GUI</"
-#~ "span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">La configurazione per %s moduli.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "Sei sicuro di uscire dalla configurazione di SCIM?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "Non tutte le configurazioni possono essere ricaricate al volo. Non "
-#~ "dimenticarti di riavviare SCIM per permettere a tutte le nuove "
-#~ "configurazioni di avere effetto."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "Configurazione di SCIM"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr ""
-#~ "Strumento di configurazione integrato basato sulla libreria di oggetti "
-#~ "GTK."
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr ""
-#~ "Programma di configurazione per il metodo inserimento comune intelligente"
-
-#~ msgid "SCIM Help"
-#~ msgstr "Aiuto di SCIM"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "Metodo inserimento comune intelligente"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr ""
-#~ "Aggancia o sgancia la finestra di inserimento e la barra degli strumenti."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr ""
-#~ "Visualizza un breve aiuto su SCIM e il metodo di inserimento attuale."
-
-#~ msgid "Show command menu."
-#~ msgstr "Mostra menu dei comandi."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid "Reload Configuration"
-#~ msgstr "Ricarica configurazione"
-
-#~ msgid "Stick Windows"
-#~ msgstr "Aggancia finestre"
-
-#~ msgid "Hide Toolbar"
-#~ msgstr "Nascondi la barra degli strumenti"
-
-#~ msgid "Help ..."
-#~ msgstr "Aiuto..."
-
-#~ msgid "Exit"
-#~ msgstr "Esci"
-
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-#~ msgid "En"
-#~ msgstr "En"
-
-#, fuzzy
-#~ msgid "_Switch input method globally"
-#~ msgstr "Mostra icona del metodo di _inserimento"
-
-#~ msgid "Preedit String mode"
-#~ msgstr "Modalità di premodifica delle stringhe"
-
-#~ msgid "X Window"
-#~ msgstr "X Window"
-
-#~ msgid "A FrontEnd module for X11R6 Window System, using XIM Protocol."
-#~ msgstr ""
-#~ "Un modulo di interfaccia per il sistema X11R6 X Window, usando il "
-#~ "protocollo XIM."
-
-#~ msgid "XIM Settings"
-#~ msgstr "Impostazioni XIM"
-
-#~ msgid "_On The Spot"
-#~ msgstr "Al v_olo"
-
-#~ msgid ""
-#~ "If this option is checked, the OnTheSpot input style will be used when "
-#~ "the client supports it."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, sarà usato lo stile di inserimento al volo "
-#~ "quando il client lo supporterà."
-
-#, fuzzy
-#~ msgid "Slovene"
-#~ msgstr "Sloveno"
-
-#~ msgid "Full/Half Letter"
-#~ msgstr "Lettera piena/mezza"
-
-#~ msgid "Full/Half Punct"
-#~ msgstr "Punteggiatura piena/mezza"
-
-#~ msgid ""
-#~ "The input mode of the letters. Click to toggle between half and full."
-#~ msgstr ""
-#~ "La modalità di inserimento delle lettere. Fai clic per passare tra mezza "
-#~ "a piena."
-
-#~ msgid ""
-#~ "The input mode of the puncutations. Click to toggle between half and full."
-#~ msgstr ""
-#~ "La modalità di inserimento della punteggiatura. Fai clic per passare tra "
-#~ "mezza a piena."
-
-#~ msgid ""
-#~ "    Switch between full/half width letter mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    Passa tra le modalità delle lettere a larghezza piena/mezza.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Switch between full/half width punctuation mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    Passa tra le modalità della punteggiatura a larghezza piena/mezza\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Switch between Forward/Input mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    Passa tra le modalità di inoltro/inserimento.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Add a new phrase.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    Aggiungi una nuova frase.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Delete the selected phrase.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "    Elimina la frase selezionata.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Control+Down:\n"
-#~ "    Move lookup cursor to next shorter phrase\n"
-#~ "    Only available when LongPhraseFirst option is set.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Control+giù:\n"
-#~ "    Sposta il cursore di ricerca alla frase più corta successiva\n"
-#~ "    Disponibile solo quanto l'opzione FraseLungaPrima è impostata.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Control+Up:\n"
-#~ "    Move lookup cursor to previous longer phrase\n"
-#~ "    Only available when LongPhraseFirst option is set.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Control+su:\n"
-#~ "    Sposta il cursore di ricerca alla frase più lunga precedente\n"
-#~ "    Disponibile solo quanto l'opzione FraseLungaPrima è impostata.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Esc:\n"
-#~ "    reimposta il metodo di inserimento.\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "How to add a phrase:\n"
-#~ "    Input the new phrase as normal, then press the\n"
-#~ "  hot key. A hint will be shown to let you input a key\n"
-#~ "  for this phrase.\n"
-#~ "    Input a key then press the space bar.\n"
-#~ "  A hint will be shown to indicate whether\n"
-#~ "  the phrase was added sucessfully.\n"
-#~ msgstr ""
-#~ "Come aggiungere una frase:\n"
-#~ "    Inserisci la frase come normale, quindi premi il\n"
-#~ "  tasto rapido. Sarà mostrato un suggerimento per\n"
-#~ "  permetterti di inserire un tasto per questa frase.\n"
-#~ "    Inserisci un tasto e premi la barra spaziatrice.\n"
-#~ "  Sarà mostrato un suggerimento per indicare se\n"
-#~ "  la frase è stata aggiunta correttamente.\n"
-
-#~ msgid "Input a key string for phrase: "
-#~ msgstr "Inserisci una stringa di tasti per la frase: "
-
-#~ msgid "Success."
-#~ msgstr "Riuscito."
-
-#~ msgid "Failed."
-#~ msgstr "Non riuscito."
-
-#~ msgid ""
-#~ "Too few argument!\n"
-#~ "Usage:\n"
-#~ "  scim-make-table <table_file> [options]\n"
-#~ "\n"
-#~ "  table_file\tthe table file for table module\n"
-#~ "  -b\t\tconvert to binary format, otherwise to text format\n"
-#~ "  -o output\tsave new table to file output\n"
-#~ "  -no\t\tdo not save new phrase table\n"
-#~ "  -if ifreq\tload phrase frequencies from this file\n"
-#~ "  -of ofreq\tsave phrase frequencies to this file\n"
-#~ "  -s file\tspecifiy the source file to count phrase ages.\n"
-#~ msgstr ""
-#~ "Troppi pochi argomenti!\n"
-#~ "Uso:\n"
-#~ "  scim-make-table <file_tabella> [opzioni]\n"
-#~ "\n"
-#~ "  file_tabella\til file tabella per il modulo tabella\n"
-#~ "  -b\t\tconverti a formato binario, altrimenti in formato testuale\n"
-#~ "  -o output\tsalva la nuova tabella al file di output\n"
-#~ "  -no\t\tnon salvare la nuova tabella delle frasi\n"
-#~ "  -if ifreq\tcarica le frequenze delle frasi da questo file\n"
-#~ "  -of ofreq\tsalva le frequenze delle frasi in questo file\n"
-#~ "  -s file\tspecifica il file sorgente per contare l'età delle frasi.\n"
-
-#~ msgid "option -no cannot be used with -o\n"
-#~ msgstr "l'opzione -no non può essere usata con -o\n"
-
-#~ msgid "option -o cannot be used with -no\n"
-#~ msgstr "l'opzione -o non può essere usata con -no\n"
-
-#~ msgid "No argument for option "
-#~ msgstr "Nessun argomento per l'opzione "
-
-#~ msgid "Invalid option: "
-#~ msgstr "Opzione non valida: "
-
-#~ msgid "Loading table file "
-#~ msgstr "Caricamento del file tabella "
-
-#~ msgid " ...\n"
-#~ msgstr " ...\n"
-
-#~ msgid "table file load failed!"
-#~ msgstr "caricamento del file tabella non riuscito!"
-
-#~ msgid "Saving frequency table file "
-#~ msgstr "Salvataggio della tabella di frequenza "
-
-#~ msgid "frequency table file load failed!"
-#~ msgstr "caricamento del file tabella di frequenza non riuscito!"
-
-#~ msgid "Saving table file "
-#~ msgstr "Salvataggio del file tabella "
-
-#~ msgid "Table file save failed!"
-#~ msgstr "Salvataggio del file tabella non riuscito!"
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2004 James Su <suzhe@tsinghua.org.cn>\n"
-#~ "\n"
-#~ "Hot keys:\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2004 James Su <suzhe@tsinghua.org.cn>\n"
-#~ "\n"
-#~ "Tasti rapidi:\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    open/close the input method.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ ":\n"
-#~ "    apri/chiudi il metodo di inserimento.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    switch to the next input method.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ ":\n"
-#~ "    passa al metodo di inserimento successivo.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    switch to the previous input method.\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ ":\n"
-#~ "    passa al metodo di inserimento precedente.\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Generic Table"
-#~ msgstr "Tabella generica"
-
-#~ msgid "An IMEngine Module which uses generic table input method file."
-#~ msgstr ""
-#~ "Un modulo IMEngine che usa un file di metodo di inserimento con tabella "
-#~ "generica."
-
-#~ msgid "Full width _punctuation:"
-#~ msgstr "_Punteggiatura a larghezza piena:"
-
-#~ msgid "Select full width puncutation keys"
-#~ msgstr "Seleziona i tasti della punteggiatura a larghezza piena"
-
-#~ msgid ""
-#~ "The key events to switch full/half width punctuation input mode. Click on "
-#~ "the button on the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per passare tra le modalità di inserimento con "
-#~ "punteggiatura a larghezza piena/mezza. Fai clic sul pulsante a destra per "
-#~ "modificarle."
-
-#~ msgid "Full width _letter:"
-#~ msgstr "_Lettera a larghezza piena:"
-
-#~ msgid "Select full width letter keys"
-#~ msgstr "Seleziona i tasti delle lettere a larghezza piena"
-
-#~ msgid ""
-#~ "The key events to switch full/half width letter input mode. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per passare tra le modalità di inserimento con "
-#~ "lettere a larghezza piena/mezza. Fai clic sul pulsante a destra per "
-#~ "modificarle."
-
-#~ msgid "_Mode switch:"
-#~ msgstr "Cambio di _modalità:"
-
-#~ msgid "Select mode switch keys"
-#~ msgstr "Seleziona i tasti per il cambio di modalità"
-
-#~ msgid ""
-#~ "The key events to change current input mode. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per cambiare la modalità di inserimento attuale. "
-#~ "Fai clic sul pulsante a destra per cambiarle."
-
-#~ msgid "_Add phrase:"
-#~ msgstr "_Aggiungi frase:"
-
-#~ msgid "Select add phrase keys."
-#~ msgstr "Seleziona i tasti per aggiungere frasi."
-
-#~ msgid ""
-#~ "The key events to add a new user defined phrase. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per aggiungere una nuova frase definita "
-#~ "dall'utente. Fai clic sul pulsante a destra per cambiarle."
-
-#~ msgid "_Delete phrase:"
-#~ msgstr "_Elimina frase:"
-
-#~ msgid "Select delete phrase keys."
-#~ msgstr "Seleziona i tasti per eliminare frasi."
-
-#~ msgid ""
-#~ "The key events to delete a selected phrase. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Le combinazioni di tasti per eliminare una frase selezionata. Fai clic "
-#~ "sul pulsante a destra per cambiarle."
-
-#~ msgid "Show _prompt"
-#~ msgstr "Mostra _prompt"
-
-#~ msgid "Show key _hint"
-#~ msgstr "Mostra su_ggerimento del tasto"
-
-#~ msgid "Save _user table in binary format"
-#~ msgstr "Salva la tabella dell'_utente in formato binario"
-
-#~ msgid "Show the u_ser defined phrases first"
-#~ msgstr "Mo_stra prima le frasi definite dall'utente"
-
-#~ msgid "Show the _longer phrases first"
-#~ msgstr "Mostra prima le frasi più _lunghe"
-
-#~ msgid ""
-#~ "If this option is checked, the key prompt of the currently selected "
-#~ "phrase will be shown."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, sarà mostrato il prompt del tasto della "
-#~ "frase attualmente selezionata."
-
-#~ msgid ""
-#~ "If this option is checked, the remaining keystrokes of the phraseswill be "
-#~ "shown on the lookup table."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, i tasti rimanenti della frase saranno "
-#~ "mostrati nella tabella di riferimento."
-
-#~ msgid ""
-#~ "If this option is checked, the user table will be stored with binary "
-#~ "format, this will increase the loading speed."
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la tabella dell'utente sarà salvata in "
-#~ "formato binario; ciò aumenterà la velocità di caricamento."
-
-#~ msgid ""
-#~ "If this option is checked, the user defined phrases will be shown in "
-#~ "front of others. "
-#~ msgstr ""
-#~ "Se questa opzione è segnata, le frasi definite dall'utente saranno "
-#~ "mostrate prima delle altre. "
-
-#~ msgid ""
-#~ "If this option is checked, the longer phrase will be shown in front of "
-#~ "others. "
-#~ msgstr ""
-#~ "Se questa opzione è segnata, la frasi più lunghe saranno mostrate prima "
-#~ "delle altre. "
-
-#~ msgid "The installed tables:"
-#~ msgstr "La tabelle installate:"
-
-#~ msgid "_Install"
-#~ msgstr "_Installa"
-
-#~ msgid "Install a new table."
-#~ msgstr "Installa una nuova tabella."
-
-#~ msgid "_Delete"
-#~ msgstr "_Elimina"
-
-#~ msgid "Delete the selected table."
-#~ msgstr "Elimina la tabella selezionata."
-
-#~ msgid "_Properties"
-#~ msgstr "_Proprietà"
-
-#~ msgid "Edit the properties of the selected table."
-#~ msgstr "Modifica le proprietà della tabella selezionata."
-
-#~ msgid "Table Management"
-#~ msgstr "Gestione delle tabelle"
-
-#~ msgid "Select an icon file"
-#~ msgstr "Seleziona un file icone"
-
-#~ msgid "User"
-#~ msgstr "Utente"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "Please select the table file to be installed."
-#~ msgstr "Per piacere seleziona il file tabella da installare."
-
-#~ msgid "Failed to install the table! It's already in table file directory."
-#~ msgstr ""
-#~ "Installazione della tabella non riuscita. È già nella cartella dei file "
-#~ "tabella."
-
-#~ msgid "Failed to load the table file!"
-#~ msgstr "Caricamento del file tabella non riuscito."
-
-#~ msgid ""
-#~ "Failed to install the table! Another version of this table was already "
-#~ "installed."
-#~ msgstr ""
-#~ "Installazione della tabella non riuscita. Un'altra versione di questa "
-#~ "tabella era già installata."
-
-#~ msgid ""
-#~ "Another version of this table was already installed. Do you want to "
-#~ "replace it with the new one?"
-#~ msgstr ""
-#~ "Un'altra versione di questa tabella era già installata. Vuoi sostituirla "
-#~ "con la nuova?"
-
-#~ msgid ""
-#~ "Failed to install the table! A table with the same file name was already "
-#~ "installed."
-#~ msgstr ""
-#~ "Installazione della tabella non riuscita. Una tabella con lo stesso nome "
-#~ "del file era già installata."
-
-#~ msgid ""
-#~ "A table with the same file name was already installed. Do you want to "
-#~ "overwrite it?"
-#~ msgstr ""
-#~ "Una tabella con lo stesso nome del file era già installata. Vuoi "
-#~ "sovrascriverla?"
-
-#~ msgid "Failed to install the table to %s!"
-#~ msgstr "Installazione della tabella in %s non riuscita."
-
-#~ msgid "Can not delete the file %s!"
-#~ msgstr "Impossibile eliminare il file %s."
-
-#~ msgid "Are you sure to delete this table file?"
-#~ msgstr "Sei sicuro di voler eliminare questo file tabella?"
-
-#~ msgid "Failed to delete the table file!"
-#~ msgstr "Eliminazione del file tabella non riuscita."
-
-#~ msgid "True"
-#~ msgstr "Vero"
-
-#~ msgid "False"
-#~ msgstr "Falso"
-
-#~ msgid "Split Keys:"
-#~ msgstr "Tasti di divisione:"
-
-#~ msgid "The key strokes to split inputed string."
-#~ msgstr "I tasti per dividere la stringa inserita."
-
-#~ msgid "Commit Keys:"
-#~ msgstr "Tasti di consegna:"
-
-#~ msgid "The key strokes to commit converted result to client."
-#~ msgstr "I tasti per consegnare il risultato convertito al client."
-
-#~ msgid "Forward Keys:"
-#~ msgstr "Tasti di inoltro:"
-
-#~ msgid "The key strokes to forward inputed string to client."
-#~ msgstr "I tasti per inoltrare la stringa inserita al client."
-
-#~ msgid "The key strokes to select candidate phrases in lookup table."
-#~ msgstr ""
-#~ "I tasti per selezionare delle frasi candidate nella tabella di "
-#~ "riferimento."
-
-#~ msgid "Page Up Keys:"
-#~ msgstr "Tasti pagina su:"
-
-#~ msgid "The lookup table page up keys"
-#~ msgstr "I tasti pagina su della tabella di riferimento"
-
-#~ msgid "Page Down Keys:"
-#~ msgstr "Tasti pagina giù:"
-
-#~ msgid "The lookup table page down keys"
-#~ msgstr "I tasti pagina giù della tabella di riferimento"
-
-#~ msgid "Table Properties"
-#~ msgstr "Proprietà della tabella"
-
-#~ msgid "Name:"
-#~ msgstr "Nome:"
-
-#~ msgid "The name of this table."
-#~ msgstr "Il nome di questa tabella."
-
-#~ msgid "Author:"
-#~ msgstr "Autore:"
-
-#~ msgid "The author of this table."
-#~ msgstr "L'autore di questa tabella."
-
-#~ msgid "UUID:"
-#~ msgstr "UUID:"
-
-#~ msgid "The unique ID of this table."
-#~ msgstr "L'ID univoca di questa tabella."
-
-#~ msgid "Serial Number:"
-#~ msgstr "Numero seriale:"
-
-#~ msgid "The serial number of this table."
-#~ msgstr "Il numero seriale di questa tabella."
-
-#~ msgid "Icon File:"
-#~ msgstr "File icone:"
-
-#~ msgid "The icon file of this table."
-#~ msgstr "Il file icone di questa tabella."
-
-#~ msgid "Supported Languages:"
-#~ msgstr "Lingue supportate:"
-
-#~ msgid "The languages supported by this table."
-#~ msgstr "Le lingue supportate da questa tabella."
-
-#~ msgid "Status Prompt:"
-#~ msgstr "Prompt di stato:"
-
-#~ msgid "A prompt string to be shown in status area."
-#~ msgstr "Una stringa di prompt da visualizzare nell'area di stato."
-
-#~ msgid "Valid Input Chars:"
-#~ msgstr "Caratteri di inserimento validi:"
-
-#~ msgid "The valid input chars of this table."
-#~ msgstr "I caratteri di inserimento validi di questa tabella."
-
-#~ msgid "Multi Wildcard Char:"
-#~ msgstr "Carattere jolly multiplo:"
-
-#~ msgid ""
-#~ "The multi wildcard chars of this table. These chars can be used to match "
-#~ "one or more arbitrary chars."
-#~ msgstr ""
-#~ "I caratteri jolly multipli di questa tabella. Questi caratteri possono "
-#~ "essere usati per corrispondere a uno o più caratteri arbitrari."
-
-#~ msgid "Single Wildcard Char:"
-#~ msgstr "Carattere jolly singolo:"
-
-#~ msgid ""
-#~ "The single wildcard chars of this table.These chars can be used to match "
-#~ "one arbitrary char."
-#~ msgstr ""
-#~ "I caratteri jolly singoli di questa tabella. Questi caratteri possono "
-#~ "essere usati per corrispondere a un carattere arbitrario."
-
-#~ msgid "Max Key Length:"
-#~ msgstr "Lunghezza massima dei tasti:"
-
-#~ msgid "The maxmium length of key strings."
-#~ msgstr "La lunghezza massima delle stringhe di tasti."
-
-#~ msgid "Show Key Prompt:"
-#~ msgstr "Mostra prompt del tasto:"
-
-#~ msgid "If true then the key prompts will be shown instead of the raw keys."
-#~ msgstr ""
-#~ "Se vero, saranno mostrati i prompt dei tasti invece dei tasti grezzi."
-
-#~ msgid "Auto Select:"
-#~ msgstr "Selezione automatica:"
-
-#~ msgid ""
-#~ "If true then the first candidate phrase will be selected automatically "
-#~ "when inputing the next key."
-#~ msgstr ""
-#~ "Se vero, la prima frase candidata sarà selezionata automaticamente quando "
-#~ "si inserisce il prossimo tasto."
-
-#~ msgid "Auto Wildcard:"
-#~ msgstr "Jolly automatico:"
-
-#~ msgid ""
-#~ "If true then a multi wildcard char will be append to the end of inputed "
-#~ "key string when searching phrases."
-#~ msgstr ""
-#~ "Se vero, un carattere jolly multiplo sarà aggiunto alla fine della "
-#~ "stringa di tasti inseriti quando si cercano le frasi."
-
-#~ msgid "Auto Commit:"
-#~ msgstr "Consegna automatica:"
-
-#~ msgid ""
-#~ "If true then the converted result string will be committed to client "
-#~ "automatically."
-#~ msgstr ""
-#~ "Se vero, la stringa risultante convertita sarà automaticamente consegnata "
-#~ "al client."
-
-#~ msgid ""
-#~ "If true then the inputed key string will be splitted automatically when "
-#~ "necessary."
-#~ msgstr ""
-#~ "Se vero, la stringa di tasti inserita sarà divisa automaticamente quando "
-#~ "necessario."
-
-#~ msgid "Discard Invalid Key:"
-#~ msgstr "Scarta tasto non valido:"
-
-#~ msgid ""
-#~ "If true then the invalid key will be discarded automatically.This option "
-#~ "is only valid when Auto Select and Auto Commit is true."
-#~ msgstr ""
-#~ "Se vero, il tasto non valido sarà scartato automaticamente. Questa "
-#~ "opzione è valida solo quando sono vere la selezione e la consegna "
-#~ "automatiche."
-
-#~ msgid "Dynamic Adjust:"
-#~ msgstr "Regolazione dinamica:"
-
-#~ msgid "If true then the phrases' frequencies will be adjusted dynamically."
-#~ msgstr "Se vero, le frequenze delle frasi saranno regolate dinamicamente."
-
-#~ msgid "Auto Fill Preedit Area:"
-#~ msgstr "Riempimento automatico dell'area di premodifica:"
-
-#~ msgid ""
-#~ "If true then the preedit string will be filled up with the current "
-#~ "candiate phrase automatically.This option is only valid when Auto Select "
-#~ "is TRUE."
-#~ msgstr ""
-#~ "Se vero, la stringa di premodifica sarà riempita automaticamente con la "
-#~ "frase candidata attuale. Questa opzione è valida solo quando la selezione "
-#~ "automatica è vera."
-
-#~ msgid "Always Show Lookup Table:"
-#~ msgstr "Mostra sempre la tabella di riferimento:"
-
-#~ msgid ""
-#~ "If true then the lookup table will always be shown when any candidate "
-#~ "phrase is available. Otherwise the lookup table will only be shown when "
-#~ "necessary.\n"
-#~ "If Auto Fill is false, then this option will be no effect, and always be "
-#~ "true."
-#~ msgstr ""
-#~ "Se vero, la tabella di riferimento sarà sempre visualizzata quando "
-#~ "qualsiasi frase candidata sarà disponibile. Altrimenti la tabella di "
-#~ "riferimento sarà visualizzata solo quando necessario.\n"
-#~ "Se il riempimento automatico è falso, questa opzione non avrà effetto, e "
-#~ "sarà sempre vera."
-
-#~ msgid "Default Full Width Punct:"
-#~ msgstr "Punteggiatura predefinita a larghezza piena:"
-
-#~ msgid "If true then full width punctuations will be inputed by default."
-#~ msgstr ""
-#~ "Se vero, saranno inseriti segni di punteggiatura a larghezza piena come "
-#~ "impostazione predefinita."
-
-#~ msgid "Default Full Width Letter:"
-#~ msgstr "Lettere predefinite a larghezza piena:"
-
-#~ msgid "If true then full width letters will be inputed by default."
-#~ msgstr ""
-#~ "Se vero, saranno inserite lettere a larghezza piena come impostazione "
-#~ "predefinita."
-
-#~ msgid "Invalid icon file."
-#~ msgstr "File icone non valido."
-
-#~ msgid "Invalid languages."
-#~ msgstr "Lingue non valide."
-
-#~ msgid "Invalid status prompt."
-#~ msgstr "Prompt di stato non valido."
-
-#~ msgid "Invalid multi wildcard chars."
-#~ msgstr "Caratteri jolly multipli non validi."
-
-#~ msgid "Invalid single wildcard chars."
-#~ msgstr "Caratteri jolly singoli non validi."
-
-#~ msgid "Invalid commit keys."
-#~ msgstr "Tasti di consegna non validi."
-
-#~ msgid "Invalid select keys."
-#~ msgstr "Tasti di selezione non validi."
-
-#~ msgid "Invalid page up keys."
-#~ msgstr "Tasti pagina su non validi."
-
-#~ msgid "Invalid page down keys."
-#~ msgstr "Tasti pagina giù non validi."
-
-#~ msgid "Invalid max key length."
-#~ msgstr "Lunghezza massima dei tasti non valida."
-
-#~ msgid "Failed to save table %s!"
-#~ msgstr "Salvataggio della tabella %s non riuscito!"
-
-#~ msgid "Failed to load any Config Modules!"
-#~ msgstr "Caricamento di qualsiasi modulo di configurazione non riuscito."
-
-#~ msgid "_Current Config Module:"
-#~ msgstr "Modulo di _configurazione attuale:"
-
-#~ msgid "<Not found>"
-#~ msgstr "<Non trovato>"
-
-#~ msgid "Current Config Module has been changed to %s."
-#~ msgstr "Il modulo di configurazione attuale è stato cambiato in %s."
-
-#~ msgid "Start the SCIM Setup Utility."
-#~ msgstr "Avvia il programma di configurazione di SCIM."
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "Spagnolo (Messico)"
 
-#~ msgid "Setup ..."
-#~ msgstr "Configurazione..."
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Tastiera virtuale attivata"
index 6c87b7f..3a1e02a 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-12-11 11:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,763 +16,720 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "英語のキーボード"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
-#, fuzzy
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
-msgstr "英語(アメリカ)"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "アムハラ語"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "アラビア語"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "アラビア語(エジプト)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "アッサム語"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "白ロシア語"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "ベンガル語"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "ベンガル語(インド)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "チベット語"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "ボスニア語"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "ウェールズ語"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "英語(オーストラリア)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "英語(カナダ)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "英語(イギリス)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "英語(アイルランド)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "英語(アメリカ)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "スペイン語(メキシコ)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "ペルシア語"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "アイルランド語"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "グジャラート語"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "ヘブライ語"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "ヒンディー語"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "インターリングア"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "インドネシア語"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
 msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "クメール語"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "カンナダ語"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "ラオス語"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "マケドニア語"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "マラヤーラム語"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "モンゴル語"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "マラーティー語"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "マレー語"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 #, fuzzy
 msgid "Burmese"
-msgstr "ブラウズ"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "ネパール語"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 #, fuzzy
 msgid "Norwegian (Nynorsk)"
 msgstr "ノルウェー語(ニューノルスク)"
 
-#: ism/src/scim_utility.cpp:768
-#, fuzzy
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "ノルウェー語(ボックモール)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "オリヤー語"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "パンジャブ語"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "アルバニア語"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "セルビア語"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "スウェーデン語(フィンランド)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "タミル語"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "テルグ語"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "タイ語"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "ウィグル語"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "ウルドゥー語"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "ウズベク語"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "ベトナム語"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "ワロン語"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "イディッシュ語"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "中国語"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 #, fuzzy
 msgid "Chinese (Simplified)"
 msgstr "簡体中国語"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 #, fuzzy
 msgid "Chinese (Hongkong)"
 msgstr "繁体中国語"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 #, fuzzy
 msgid "Chinese (Traditional)"
 msgstr "繁体中国語"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 #, fuzzy
 msgid "Dutch (Belgian)"
 msgstr "ベルギー"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 #, fuzzy
 msgid "English (New Zealand)"
 msgstr "英語(アイルランド)"
 
-#: ism/src/scim_utility.cpp:812
-#, fuzzy
-msgid "English (Irish)"
-msgstr "英語(イギリス)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 #, fuzzy
 msgid "English (South Africa)"
 msgstr "英語(アメリカ)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 #, fuzzy
 msgid "English (Jamaica)"
 msgstr "英語(カナダ)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 #, fuzzy
 msgid "English (Belize)"
 msgstr "英語(イギリス)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 #, fuzzy
 msgid "English (Trinidad)"
 msgstr "英語(イギリス)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 #, fuzzy
 msgid "English (Zimbabwe)"
 msgstr "英語(カナダ)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 #, fuzzy
 msgid "English (Philippines)"
 msgstr "英語(イギリス)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 #, fuzzy
 msgid "French (Belgian)"
 msgstr "フランス語(カナダ)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 #, fuzzy
 msgid "French (Swiss)"
 msgstr "ドイツ語(スイス)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 #, fuzzy
 msgid "French (Monaco)"
 msgstr "フランス語(カナダ)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "ドイツ語(スイス)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 #, fuzzy
 msgid "German (Austrian)"
 msgstr "英語(オーストラリア)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 #, fuzzy
 msgid "German (Liechtenstein)"
 msgstr "ドイツ語(スイス)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 #, fuzzy
 msgid "Italian (Swiss)"
 msgstr "ドイツ語(スイス)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "ポルトガル語(ブラジル)"
-
-#: ism/src/scim_utility.cpp:834
-#, fuzzy
-msgid "Spanish (Traditional Sort)"
-msgstr "スペイン語(ラテンアメリカ)"
-
-#: ism/src/scim_utility.cpp:835
-#, fuzzy
-msgid "Spanish (Mexican)"
-msgstr "スペイン語(メキシコ)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 #, fuzzy
 msgid "Spanish (Guatemala)"
 msgstr "スペイン語(ラテンアメリカ)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 #, fuzzy
 msgid "Spanish (Costa Rica)"
 msgstr "スペイン語(ラテンアメリカ)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 #, fuzzy
 msgid "Spanish (Panama)"
 msgstr "スペイン語(ラテンアメリカ)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 #, fuzzy
 msgid "Spanish (Dominican Republic)"
 msgstr "スペイン語(ラテンアメリカ)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 #, fuzzy
 msgid "Spanish (Venezuela)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 #, fuzzy
 msgid "Spanish (Colombia)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 #, fuzzy
 msgid "Spanish (Peru)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 #, fuzzy
 msgid "Spanish (Argentina)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 #, fuzzy
 msgid "Spanish (Ecuador)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 #, fuzzy
 msgid "Spanish (Chile)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 #, fuzzy
 msgid "Spanish (Uruguay)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 #, fuzzy
 msgid "Spanish (Paraguay)"
 msgstr "スペイン語(CP 850)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 #, fuzzy
 msgid "Spanish (Bolivia)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 #, fuzzy
 msgid "Spanish (Honduras)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 #, fuzzy
 msgid "Spanish (Nicaragua)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 #, fuzzy
 msgid "Spanish (Puerto Rico)"
 msgstr "スペイン語(メキシコ)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-#, fuzzy
-msgid "Malay (Malaysia)"
-msgstr "マラヤーラム語"
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "ノルウェー語"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-#, fuzzy
-msgid "Chinese (Taiwan)"
-msgstr "繁体中国語"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "繁体中国語"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 #, fuzzy
 msgid "Chinese (Macau)"
 msgstr "繁体中国語"
 
-#: ism/src/scim_utility.cpp:888
-#, fuzzy
-msgid "Chinese (PRC)"
-msgstr "中国語"
-
-#: ism/src/scim_utility.cpp:889
-#, fuzzy
-msgid "Chinese (Singapore)"
-msgstr "簡体中国語"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 #, fuzzy
 msgid "Arabic (Iraq)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 #, fuzzy
 msgid "Arabic (Libya)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 #, fuzzy
 msgid "Arabic (Algeria)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 #, fuzzy
 msgid "Arabic (Morocco)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 #, fuzzy
 msgid "Arabic (Tunisia)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 #, fuzzy
 msgid "Arabic (Oman)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 #, fuzzy
 msgid "Arabic (Yemen)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 #, fuzzy
 msgid "Arabic (Syria)"
 msgstr "アラビア語(エジプト)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 #, fuzzy
 msgid "Arabic (Jordan)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 #, fuzzy
 msgid "Arabic (Kuwait)"
 msgstr "アラビア語(エジプト)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 #, fuzzy
 msgid "Arabic (UAE)"
 msgstr "アラビア語(エジプト)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 #, fuzzy
 msgid "Arabic (Bahrain)"
 msgstr "アラビア語(レバノン)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 #, fuzzy
 msgid "Arabic (Qatar)"
 msgstr "アラビア語(エジプト)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "その他"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "不明"
 
@@ -812,10 +769,6 @@ msgstr "スロバキア語(qwerty)"
 msgid "Spanish (CP 850)"
 msgstr "スペイン語(CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "スペイン語(ラテンアメリカ)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "英語(UK)"
@@ -873,11 +826,11 @@ msgstr "簡体->繁体"
 msgid "TC->SC"
 msgstr "繁体->簡体"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "Smart Common Input Method platform"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -887,7 +840,7 @@ msgstr ""
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -895,7 +848,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -903,15 +856,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "有効にする"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "入力方法を選択"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "入力方法の設定"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%sが選択されました。"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "%sのみ利用可能です。"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "名称"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "ハードウェアキーボードからの入力を検出しました。"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "仮想キーボードを使用するにはタップします。"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1089,120 +1073,206 @@ msgid "The orientation of the tray."
 msgstr "トレイの方向"
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-#, fuzzy
-msgid "Next"
-msgstr "テキスト"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
 
+#~ msgid "English (British)"
+#~ msgstr "英語(イギリス)"
+
+#~ msgid "English (American)"
+#~ msgstr "英語(アメリカ)"
+
+#, fuzzy
+#~ msgid "English (Irish)"
+#~ msgstr "英語(イギリス)"
+
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "ポルトガル語(ブラジル)"
+
+#, fuzzy
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "マラヤーラム語"
+
+#, fuzzy
+#~ msgid "Chinese (PRC)"
+#~ msgstr "中国語"
+
+#, fuzzy
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "簡体中国語"
+
+#, fuzzy
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "繁体中国語"
+
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "繁体中国語"
+
+#, fuzzy
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "スペイン語(ラテンアメリカ)"
+
+#, fuzzy
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "スペイン語(メキシコ)"
+
+#~ msgid "Enable"
+#~ msgstr "有効にする"
+
+#~ msgid "Name"
+#~ msgstr "名称"
+
+#, fuzzy
+#~ msgid "Next"
+#~ msgstr "テキスト"
+
 #, fuzzy
 #~ msgid "Keyboards"
 #~ msgstr "英語/キーボード"
@@ -1288,9 +1358,6 @@ msgstr ""
 #~ "入力メソッドを終了するキー。変更する場合は\n"
 #~ "右のボタンをクリックして下さい。"
 
-#~ msgid "_Next input method:"
-#~ msgstr "次の入力メソッド(_N):"
-
 #~ msgid "Select the next input method keys"
 #~ msgstr "次の入力メソッドキーの設定"
 
@@ -2413,3 +2480,6 @@ msgstr ""
 
 #~ msgid "Setup ..."
 #~ msgstr "設定..."
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "仮想キーボードが有効になりました。"
index c18add9..c1f4807 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "აირჩიეთ წერის მეთოდი"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "დააყენეთ ტესტის აკრეფის მეთოდები"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s არჩეულია"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "ხელმისაწვდომის მხოლოდ %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "შეინიშნა მონაცემთა შეყვანა ფიზიკური კლავიატურით"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "შეეხეთ და გამოიყენეთ ვირტუალური კლავიატურა"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "ვირტუალური კლავიატურა ჩართულია"
index c18add9..15150e6 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Енгізу әдісін таңдау"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Енгізу әдістерін орнату"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s таңдалды"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Тек %s қол жетімді"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Аппараттық құрал пернетақтасында енгізу анықталды"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Виртуалды пернетақтаны пайдалану үшін түртіңіз"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Виртуалды пернетақта қосылған"
index a77afd9..7f42da1 100644 (file)
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SCIM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-07-08 18:16+0900\n"
 "Last-Translator: Choe Hwanjin <choe.hwanjin@gmail.com>\n"
 "Language-Team: Korean <en@li.org>\n"
@@ -18,705 +18,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "영어 키보드"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr "영어 입력 서비스"
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "암하라어"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "아랍어"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "아랍어 (이집트)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "아랍어 (레바논)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "아삼어"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "벨로루시어"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "벵갈어"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "뱅갈어 (인도)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "티벳어"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "보스니아어"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "웨일즈어"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "영어 (호주)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "영어 (캐나다)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "영어 (영국)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "영어 (아일랜드)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "영어 (미국)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "스페인어 (멕시코)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "페르시아어"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "아일랜드어"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "구자라트어"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "히브리어"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "힌두어"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "국제어"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "인도네시아어"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "일본어"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "캄보디아어"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "칸나다어"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "라오스어"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "마케도니아어"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "말라얄람어"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "몽골어"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "마라타어"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "말레이어"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "버마어"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "네팔어"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr "노르웨이어 (뉘노르스크)"
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "노르웨이어 (부크말)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "오리야어"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "펀자브어"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "싱할라어"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "알바니아어"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "세르비아어"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "스웨덴어 (핀란드)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "타밀어"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "텔루구어"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "타이어"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "위그루어"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "우르두어"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "우즈베키스탄어"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "베트남어"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "와론어"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "이디시어"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "중국어"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr "중국어 (간체)"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr "중국어 (홍콩)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr "중국어 (번체)"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr "네덜란드어 (벨기에)"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr "영어 (뉴질랜드)"
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr "영어 (아일랜드)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr "영어 (남아프리카)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr "영어 (자메이카)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr "영어 (벨리즈)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr "영어 (트리니다드)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr "영어 (짐바브웨)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr "영어 (필리핀)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr "프랑스어 (벨기에)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr "독일어 (스위스)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr "프랑스어 (룩셈부르크)"
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr "프랑스어 (모나코)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "독일어 (스위스)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr "영어 (호주)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr "독일 (룩셈부르크)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr "독일어 (리히텐슈타인)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr "이탈리아어 (스위스)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "포루투갈어 (브라질)"
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr "스페인어 (전통 정렬)"
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr "스페인어 (멕시코)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr "스페인어 (과테말라)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr "스페인어 (코스타리카)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr "스페인어 (파나마)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr "스페인어 (도미니카)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr "스페인어 (베네수엘라)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr "스페인어 (콜롬비아)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr "스페인어 (페루)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr "스페인어 (아르헨티나)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr "스페인어 (에콰도르)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr "스페인어 (칠레)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr "스페인어 (우루과이)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr "스페인어 (파라과이)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr "스페인어 (볼리비아)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr "스페인어 (엘사바도르)"
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr "스페인어 (온두라스)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr "스페인어 (니카라과)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr "스페인어 (푸에르토리코)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr "아프리칸스어"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr "말레이어 (말레이시아)"
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr "말레이어 (브루나이)"
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "노르웨이어"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr "세르비아어 (키릴)"
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr "우즈벡어 (라틴)"
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr "중국어 (대만)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "중국어 (홍콩)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr "중국어 (마카오)"
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr "중국어 (중국)"
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr "중국어 (싱가폴)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr "아랍어 (사우디 아라비아)"
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr "아랍어 (이라크)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr "아랍어 (리비아)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr "아랍어 (알제리)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr "아랍어 (모로코)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr "아랍어 (튀니지)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr "아랍어 (오만)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr "아랍어 (예멘)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr "아랍어 (시리아)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr "아랍어 (요르단)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr "아랍어 (쿠웨이트)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr "아랍어 (아랍에미레이트)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr "아랍어 (바레인)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr "아랍어 (카타르)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr "하우사어"
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr "호사족어"
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr "요루바어"
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr "줄루어"
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "기타"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "알수없는"
 
@@ -756,10 +722,6 @@ msgstr "슬로바키아어 (쿼티)"
 msgid "Spanish (CP 850)"
 msgstr "스페인어 (CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "스페인어 (라틴 아메리카)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "영어 (영국)"
@@ -817,11 +779,11 @@ msgstr "간체->번체"
 msgid "TC->SC"
 msgstr "번체->간체"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "똑똑한 일반 입력 방식 플랫폼 "
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -831,7 +793,7 @@ msgstr ""
 "(C) 2002-2005 제임스 수 <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -839,7 +801,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -847,15 +809,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "활성화"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "입력 방식 선택"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "이름"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "입력 방식 설정"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s이(가) 선택되었습니다"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "%s만 사용할 수 있습니다"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "하드웨어 키보드로부터 입력을 감지하였습니다"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "가상 키보드를 사용하려면 누르세요"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1027,558 +1020,191 @@ msgid "The orientation of the tray."
 msgstr "트레이의 방향."
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
-msgstr "이전"
-
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
-msgstr "다음"
-
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#~ msgid "RAW CODE"
-#~ msgstr "RAW CODE"
-
-#~ msgid "(C) 2002-2006 Ja/mes Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 제임스 수 <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "단축키:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    멀티바이트 인코딩과 유니코드간 전환.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    입력기 초기화.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "현재 입력 상태입니다. 바꾸길 원하시면 클릭하십시오."
-
-#~ msgid "Unicode"
-#~ msgstr "유니코드"
-
-#~ msgid "Global Setup"
-#~ msgstr "전체 설정"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "X11, GTK 입력모듈, QT 입력모듈 등 모든 프론트엔드에대한 전체 설정을 합니"
-#~ "다."
-
-#~ msgid "_Trigger:"
-#~ msgstr "전환키(_T):"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "전환키 선택"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "SCIM 입력방식을 끄고/켜기 위한 키 설정입니다. 우측 단추를 클릭하고 수정하"
-#~ "세요."
-
-#~ msgid "Turn _On:"
-#~ msgstr "활성화(_O):"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "활성화키 선택"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "SCIM 입력방식을 켜기 위한 키 설정. 우측 단추를 클릭하고 수정하세요."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "끄기(_f):"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "끄기 키 선택"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "SCIM 입력방식을 끄기 위한 키 설정. 우측 단추를 클릭하고 수정하세요."
-
-#~ msgid "_Next input method:"
-#~ msgstr "다음 입력방식(_N):"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "다음 입력 방식으로 바꾸는데 사용할 키 선택"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "다음 입력방식으로 전환을 위한 키설정. 오를쪽 단추를 클릭하고 수정하세요."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "이전 입력방식(_P):"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "이전 입력방식을 선택"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "이전 입력방식으로 전환을 위한 키 설정. 우측 단추를 클릭하고 수정하세요."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "입력방식 방법 보여줌(_M)"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "입력 방식 보여줌 메뉴 키 선택"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "입력방식 메뉴를 보여줌 설정. 오를쪽 단추를 클릭하고 수정하세요."
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "현재 사용하는 키보드 레이아웃을 선택하세요, 그래야만 사용하려는 입력방법들"
-#~ "이 정확히 작동할수 있습니다."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "조합중인 글자를 클라이언트 윈도우에서 보여줌(_E)"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "이 옵션을 켜면, 조합중인 글자가 독립된 창에서 보이지 않고 입력창에서 바로 "
-#~ "보이게됩니다."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "모든 프로그램에 같은 입력 방법을 공유(_S)"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "이 옵션을 켜면 단하나의 입력 방법을 모든 프로그램에서 동시에 사용하게됩니"
-#~ "다. 선택하지 않으면 각각의 프로그램에서 다른 입력 방법이 적용됩니다."
-
-#~ msgid "Hotkeys"
-#~ msgstr "단축키"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr "각 입력 방법들과 단축키를 활성화하거나, 비활성화 할수 있습니다."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "설치된 입력기 서비스들:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "단축키 수정(_H)"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "선택된 입력 방식에 관련된 단축키 수정."
-
-#~ msgid "Select _Filters"
-#~ msgstr "필터 선택"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "현재 입력 방법에 연결될 필터 선택."
-
-#~ msgid "_Expand"
-#~ msgstr "확장(_E)"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "모든 언어 카테고리를 확장 "
-
-#~ msgid "_Collapse"
-#~ msgstr "축소(_C)"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "모든 언어 카테고리를 축소."
-
-#~ msgid "E_nable All"
-#~ msgstr "모두 활성화(_n)"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "모든 입력 방법을 활성화 "
-
-#~ msgid "_Disable All"
-#~ msgstr "모두 비활성(_D)"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "모든 입력 모듈 비활성화"
-
-#~ msgid "Filters"
-#~ msgstr "필터"
-
-#~ msgid "Description"
-#~ msgstr "설명"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "%s 단축기 수정"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "%s(을)를 위한 필터 선택"
-
-#~ msgid "Move _Up"
-#~ msgstr "위로(_U)"
-
-#~ msgid "Move _Down"
-#~ msgstr "아래로(_D)"
-
-#~ msgid "GTK"
-#~ msgstr "GTK"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "GTK+-2.x 라이브러리를 기반으로 한 패널 디먼"
-
-#~ msgid "On demand"
-#~ msgstr "필요할때"
-
-#~ msgid "Never"
-#~ msgstr "전혀안함"
-
-#~ msgid "ToolBar"
-#~ msgstr "도구바"
-
-#~ msgid "_Show:"
-#~ msgstr "보이기(_S):"
-
-#~ msgid "Auto s_nap"
-#~ msgstr "자동 스냅(_n)"
-
-#~ msgid "Show _input method icon"
-#~ msgstr "입력방식 아이콘 보임(_i)"
-
-#~ msgid "Show inp_ut method name"
-#~ msgstr "입력방식 이름 보임(_u)"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
+msgstr ""
 
-#~ msgid "Hide time_out:"
-#~ msgstr "숨기기 시간 제한(_o):"
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
+msgstr ""
 
-#~ msgid "Show s_tick icon"
-#~ msgstr "고정 아이콘 보임(_t)"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid "Show m_enu icon"
-#~ msgstr "메뉴 아이콘 보임(_e)"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid "Show _help icon"
-#~ msgstr "도움말 아이콘 보임(_h)"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "Show _property label"
-#~ msgstr "속성 상태 보임(_p)"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Input window"
-#~ msgstr "입력창"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "내장된 미리보기 테이블 사용(_m)"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "_Vertical lookup table"
-#~ msgstr "미리보기 테이블 세로로 보기(_V)"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Misc"
-#~ msgstr "기타"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "Show tra_y icon"
-#~ msgstr "트레이 아이콘 보이기(_y)"
+#~ msgid "English (British)"
+#~ msgstr "영어 (영국)"
 
-#~ msgid "Stick _windows"
-#~ msgstr "ì°½ ê³ ì \95(_w)"
+#~ msgid "English (American)"
+#~ msgstr "ì\98\81ì\96´ (미국)"
 
-#~ msgid "_Font:"
-#~ msgstr "글꼴(_F):"
+#~ msgid "English (Irish)"
+#~ msgstr "영어 (아일랜드)"
 
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "\"항상\" 옵션이 선택되면 도구상자는 항상 화면에 보이게 됩니다. \"필요할때"
-#~ "\" 옵션이 선택되면 SCIM이 활성화 됐을 때만 보이게 됩니다. \"전혀안함\" 옵"
-#~ "션을 선택하면 전혀 보이지 않게 됩니다."
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "포루투갈어 (브라질)"
 
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr ""
-#~ "이 설정을 선택하면, 도구상자가 화면 가장자리에 맞춰 움직이게 됩니다."
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "말레이어 (말레이시아)"
 
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "일정 시간이 지나면 도구상자가 사라질 것입니다. 이 옵션은 \"항상 보임\" 옵"
-#~ "션이 선택 되어 있을때 작동합니다. 0으로 설정하면 작동하지 않습니다."
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr "이 옵션을 선택하면, 입력방법 아이콘이 도구상자에 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr "이 옵션을 선택하면, 입력방법의 이름이 도구상자에 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr "이 옵션을 선택하면, 고정 아이콘이 도구상자에 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr "이 옵션을 선택하면, 메뉴 아이콘이 도구상자에 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr "이 옵션을 선택하면, 도구창에 도움말 아이콘이 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr ""
-#~ "이 옵션을 선택하면, 입력 방식의 속성들을 도구상자에서 볼 수 있습니다."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr "이 옵션을 선택하면, 미리보기 테이블이 입력창에 바로 붙을 것입니다."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr "이 옵션을 선택하면, 미리보기 테이블이 세로로 나타납니다."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr ""
-#~ "이 옵션을 선택하면, 트레이 아이콘이 데스크탑 테스크바에 보이게 됩니다."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr ""
-#~ "이 옵션을 선택하면, 도구상자, 입력창과 미리보기창들의 위치가 고정됩니다."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr "글꼴 설정은 입력창과 미리보기 테이블 창에 사용됩니다."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "글꼴 선택"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "프론트엔드"
-
-#~ msgid "IMEngine"
-#~ msgstr "입력기엔진"
-
-#~ msgid "Extra"
-#~ msgstr "기타"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "SCIM 입력기 설정"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">똑똑한 공통 입력 방법</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI 설정 프로그램</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, 제임스 수 &lt;suzhe@tsinghua."
-#~ "org.cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">%s 모듈을 위한 설정.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "SCIM 설정을 종료하시겠습니까?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "모든 환경 설정을 새로 불러오진 못 합니다. 새로운 환경설정을 모두 적용 하"
-#~ "기 위해서는 SCIM을 다시 시작해야 합니다."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "SCIM 설정"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr "GTK 라이브러리 기반의 설정 프로그램"
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "똑똑한 공통 입력 방법 (SCIM)을 위한 설정 프로그램"
-
-#~ msgid "SCIM Help"
-#~ msgstr "SCIM 도움말"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "똑똑한 공통 입력 방법"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "입력창과 도구상자 고정/비고정."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "SCIM 과 현재 입력 방법에 대한 간단한 도움말을 보여줌."
-
-#~ msgid "Show command menu."
-#~ msgstr "명령 메뉴를 보임."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2005 제임스 수 <suzhe@tsinghua.org.cn>"
+#~ msgid "Chinese (PRC)"
+#~ msgstr "중국어 (중국)"
 
-#~ msgid "Reload Configuration"
-#~ msgstr "ì\84¤ì \95 ì\83\88ë¡\9c ë¶\88ë\9f¬ì\98¤ê¸°"
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "ì¤\91êµ­ì\96´ (ì\8b±ê°\80í\8f´)"
 
-#~ msgid "Stick Windows"
-#~ msgstr "ì\9c\88ë\8f\84ì\9a° ê³ ì \95"
+#~ msgid "Uzbek (Latin)"
+#~ msgstr "ì\9a°ì¦\88벡ì\96´ (ë\9d¼í\8b´)"
 
-#~ msgid "Hide Toolbar"
-#~ msgstr "도구바 숨김"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "중국어 (대만)"
 
-#~ msgid "Help ..."
-#~ msgstr "도움말 ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "중국어 (홍콩)"
 
-#~ msgid "Exit"
-#~ msgstr "끝내기"
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "스페인어 (전통 정렬)"
 
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "스페인어 (멕시코)"
 
-#~ msgid "En"
-#~ msgstr "En"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "가상 키보드가 실행되었습니다"
index c18add9..e5cd19d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Pasir. įvest. rež."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Nustatyti įvesties metodus"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Pasirinkta: %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Galima tik %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Aptikta įvestis iš aparatinės įrangos klaviatūros"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Bakstelėkite ir naudokite virtualiąją klaviatūrą"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtualioji klaviatūra įjungta"
index c18add9..fd8735b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Iev. metodes izvēle"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Ievades metožu iestatīšana"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Izvēlēta %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Pieejams tikai %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Noteikta ievade no aparatūras tastatūras"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Pieskarieties, lai izmantotu virtuālo tastatūru"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuālā tastatūra ir aktivizēta"
index c18add9..6d94831 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Изберете внесување"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Постави начини на внесување"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s е избран"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Само %s е достапен"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Откриено е внесување од хардверска тастатура"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Допрете за да користите виртуелна тастатура"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Виртуелната тастатура е вклучена"
index c18add9..eef8cad 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Velg inndatametode"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Konfigurer inndatametoder"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s valgt"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Bare %s tilgjengelig"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Signaler oppdaget fra det fysiske tastaturet"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Trykk for å bruke virtuelt tastatur"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuelt tastatur aktivert"
index 0ed856d..4824b80 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2007-03-17 18:54+0100\n"
 "Last-Translator: Ronald Stroethoff <stroet43@zonnet.nl>\n"
 "Language-Team: Nederlands\n"
@@ -19,763 +19,719 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "Nederlands toetsenbord"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
-#, fuzzy
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
-msgstr "Engels (USA)"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "Amhaars"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "Arabisch"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "Arabisch (Egyptisch)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "Assamitisch"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "Witrussisch"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "Bengaals"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "Bengaals (India)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "Tibetaans"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "Bosnisch"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "Welsh"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr "Divehi"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "Engels (Australie)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "Engels (Canada)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "Engels (Groot Britannie)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "Engels (Ierland)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "Engels (USA)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "Spaans (Mexico)"
+msgstr "Español (México)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "Perzisch"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "Iers"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "Hebreeuws"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "Hindi"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "Interlingua"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "Indonesisch"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "Japans"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "Cambojaans"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "Laothian"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "Macedonisch"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "Mongools"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "Marathi"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "Maleis"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "Birmaans"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "Nepalees"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 #, fuzzy
 msgid "Norwegian (Nynorsk)"
 msgstr "Noors (Nynorsk)"
 
-#: ism/src/scim_utility.cpp:768
-#, fuzzy
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "Noors (Bokmal)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "Singalees"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "Albanees"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "Servisch"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "Zweeds (Finland)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "Thais"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "Oeigoers"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "Urdu"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "Oezbeeks"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "Vietnamees"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "Waals"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "Jiddisch"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "Chinees"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 #, fuzzy
 msgid "Chinese (Simplified)"
 msgstr "Chinees (versimpeld)"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 #, fuzzy
 msgid "Chinese (Hongkong)"
 msgstr "Chinees (traditioneell)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 #, fuzzy
 msgid "Chinese (Traditional)"
 msgstr "Chinees (traditioneell)"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 #, fuzzy
 msgid "Dutch (Belgian)"
 msgstr "Belgisch"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 #, fuzzy
 msgid "English (New Zealand)"
 msgstr "Engels (Ierland)"
 
-#: ism/src/scim_utility.cpp:812
-#, fuzzy
-msgid "English (Irish)"
-msgstr "Engels (Groot Britannie)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 #, fuzzy
 msgid "English (South Africa)"
 msgstr "Engels (USA)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 #, fuzzy
 msgid "English (Jamaica)"
 msgstr "Engels (Canada)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 #, fuzzy
 msgid "English (Belize)"
 msgstr "Engels (Groot Britannie)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 #, fuzzy
 msgid "English (Trinidad)"
 msgstr "Engels (Groot Britannie)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 #, fuzzy
 msgid "English (Zimbabwe)"
 msgstr "Engels (Canada)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 #, fuzzy
 msgid "English (Philippines)"
 msgstr "Engels (Groot Britannie)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 #, fuzzy
 msgid "French (Belgian)"
 msgstr "Frans (Canada)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 #, fuzzy
 msgid "French (Swiss)"
 msgstr "Duits (Schwitsers)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 #, fuzzy
 msgid "French (Monaco)"
 msgstr "Frans (Canada)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "Duits (Schwitsers)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 #, fuzzy
 msgid "German (Austrian)"
 msgstr "Engels (Australie)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 #, fuzzy
 msgid "German (Liechtenstein)"
 msgstr "Duits (Schwitsers)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 #, fuzzy
 msgid "Italian (Swiss)"
 msgstr "Duits (Schwitsers)"
 
-#: ism/src/scim_utility.cpp:832
-#, fuzzy
-msgid "Portuguese (Brazilian)"
-msgstr "Portugees (Brazilie)"
-
-#: ism/src/scim_utility.cpp:834
-#, fuzzy
-msgid "Spanish (Traditional Sort)"
-msgstr "Spaans (Latijns Amerika)"
-
-#: ism/src/scim_utility.cpp:835
-#, fuzzy
-msgid "Spanish (Mexican)"
-msgstr "Spaans (Mexico)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 #, fuzzy
 msgid "Spanish (Guatemala)"
 msgstr "Spaans (Latijns Amerika)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 #, fuzzy
 msgid "Spanish (Costa Rica)"
 msgstr "Spaans (Latijns Amerika)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 #, fuzzy
 msgid "Spanish (Panama)"
 msgstr "Spaans (Latijns Amerika)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 #, fuzzy
 msgid "Spanish (Dominican Republic)"
 msgstr "Spaans (Latijns Amerika)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 #, fuzzy
 msgid "Spanish (Venezuela)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 #, fuzzy
 msgid "Spanish (Colombia)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 #, fuzzy
 msgid "Spanish (Peru)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 #, fuzzy
 msgid "Spanish (Argentina)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 #, fuzzy
 msgid "Spanish (Ecuador)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 #, fuzzy
 msgid "Spanish (Chile)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 #, fuzzy
 msgid "Spanish (Uruguay)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 #, fuzzy
 msgid "Spanish (Paraguay)"
 msgstr "Spaans (CP 850)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 #, fuzzy
 msgid "Spanish (Bolivia)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 #, fuzzy
 msgid "Spanish (Honduras)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 #, fuzzy
 msgid "Spanish (Nicaragua)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 #, fuzzy
 msgid "Spanish (Puerto Rico)"
 msgstr "Spaans (Mexico)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:859
-#, fuzzy
-msgid "Malay (Malaysia)"
-msgstr "Malayalam"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "Noors"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-#, fuzzy
-msgid "Chinese (Taiwan)"
-msgstr "Chinees (traditioneell)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "Chinees (traditioneell)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 #, fuzzy
 msgid "Chinese (Macau)"
 msgstr "Chinees (traditioneell)"
 
-#: ism/src/scim_utility.cpp:888
-#, fuzzy
-msgid "Chinese (PRC)"
-msgstr "Chinees"
-
-#: ism/src/scim_utility.cpp:889
-#, fuzzy
-msgid "Chinese (Singapore)"
-msgstr "Chinees (versimpeld)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 #, fuzzy
 msgid "Arabic (Iraq)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 #, fuzzy
 msgid "Arabic (Libya)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 #, fuzzy
 msgid "Arabic (Algeria)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 #, fuzzy
 msgid "Arabic (Morocco)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 #, fuzzy
 msgid "Arabic (Tunisia)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 #, fuzzy
 msgid "Arabic (Oman)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 #, fuzzy
 msgid "Arabic (Yemen)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 #, fuzzy
 msgid "Arabic (Syria)"
 msgstr "Arabisch (Egyptisch)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 #, fuzzy
 msgid "Arabic (Jordan)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 #, fuzzy
 msgid "Arabic (Kuwait)"
 msgstr "Arabisch (Egyptisch)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 #, fuzzy
 msgid "Arabic (UAE)"
 msgstr "Arabisch (Egyptisch)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 #, fuzzy
 msgid "Arabic (Bahrain)"
 msgstr "Arabisch (Libanees)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 #, fuzzy
 msgid "Arabic (Qatar)"
 msgstr "Arabisch (Egyptisch)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "Overige"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -815,10 +771,6 @@ msgstr "Slowaaks (qwerty)"
 msgid "Spanish (CP 850)"
 msgstr "Spaans (CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "Spaans (Latijns Amerika)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "Engels (UK)"
@@ -877,11 +829,11 @@ msgstr "VC->TC"
 msgid "TC->SC"
 msgstr "TC->VC"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "Smart Common Invoer-methode Plattform "
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -891,7 +843,7 @@ msgstr ""
 "(c) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -899,7 +851,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -907,15 +859,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "Aanzetten"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Invoermethode selecteren"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Invoermethoden instellen"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s geselecteerd"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "Naam"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Alleen %s beschikbaar"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Invoer gedetecteerd vanaf hardwaretoetsenbord"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tik om virtueel toetsenbord te gebruiken"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1096,599 +1079,196 @@ msgid "The orientation of the tray."
 msgstr "De richting van de werkbalk."
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-#, fuzzy
-msgid "Next"
-msgstr "Tekst"
-
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#, fuzzy
-#~ msgid "RAW CODE"
-#~ msgstr "Unicode RAW CODE"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(c) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "Sneltoetsen:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    Omschakelen tussen Multibyte-Codering en Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    Invoer-methode terug zetten.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr ""
-#~ "De status van de huidige invoer-methode. Klik op deze om het te "
-#~ "veranderen."
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "Algemene instellingen"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "Algemene instellingen die door alle FrontEnd-modules gebruikt worden, "
-#~ "inclusief de X11 FrontEnd, GKT IMModule, QT IMModule, enz."
-
-#, fuzzy
-#~ msgid "_Trigger:"
-#~ msgstr "_Trigger:"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "Trigger-toetsen kiezen"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Toets-combinaties, waarmee de SCIM-invoer-methode wordt IN- en UIT-"
-#~ "geschakeld. Om dit te veranderen, klik op de rechterknop."
-
-#~ msgid "Turn _On:"
-#~ msgstr "_Inschakelen:"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "Kies de inschakel toets."
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Toetscombinatie om de invoer-methode SCIM inteschakelen.Klik op de "
-#~ "rechterknop om te veranderen."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "U_itschakelen"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "UIT-schakeltoetsen uitkiezen"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Toetscombinatie waarmee de invoer-methode SCIM uitgeschakeld wordt. Klik "
-#~ "op de rechterknop om te veranderen."
-
-#~ msgid "_Next input method:"
-#~ msgstr "_Volgende invoer-methode:"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr ""
-#~ "Kies een toetscombinatie om naar de volgende invoer-methode te gaan."
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr ""
-#~ "Met deze toetscombinatie, gaat men naar de volgende invoer-methode. klik "
-#~ "op de rechterknop om te veranderen."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "_Vorige invoer-methode:"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "Kies de toetscombinatie om naar de vorige invoer-methode te gaan"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr ""
-#~ "Met deze toetscombinatie gaat men naar de vorige invoer-methode. Klik op "
-#~ "de rechterknop om te veranderen."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "Toon het keuze-menu voor invoer-methoden:"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "Kies de toetsen voor het tonen van het invoer-methode kies-menu"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr ""
-#~ "Toetscombinatie's voor het tonen van het invoer-methode kies-menu. Klik "
-#~ "rechts voor het instellen."
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "_Toetsenbord layout:"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "Kies hier de huidige gebruikte toetsenbord-layout, zodat invoer-methoden, "
-#~ "die van het toetsenbord-layout  afhankelijk zijn, goed werken."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "Invoer direkt in programma-venster tonen."
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "Wanneer voor deze optie gekozen is, wordt de invoer direkt in het "
-#~ "programma-venster getoond, in plaats van een extra invoer-venster."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "Dezelfde invoer-methode voor alle programma's gebruiken."
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "Wanneer dit gekozen is, wordt een en dezelfde invoer-methode voor alle "
-#~ "programma's gebruikt. Wanneer dit niet gekozen is, kan voor elke "
-#~ "programma een andere invoer-methode gekozen worden."
-
-#~ msgid "Hotkeys"
-#~ msgstr "Sneltoetsen"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr ""
-#~ "Hier kunnen de geïnstalleerde invoer-methoden IN- en UIT-geschakeld "
-#~ "worden en hiervoor sneltoetsen gekozen worden."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "Geïnstalleerde invoer-methoden:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "_Sneltoetsen instellen"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "Sneltoetsen voor de gekozen invoer-methode instellen."
-
-#~ msgid "Select _Filters"
-#~ msgstr "_Filter selecteren"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "Kies de filter, die aan deze invoer-methode verbonden moet worden."
-
-#~ msgid "_Expand"
-#~ msgstr "Uitbreiden"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "Alle taalgroepen uitbreiden."
-
-#~ msgid "_Collapse"
-#~ msgstr "Samenvouwen"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "Alle taalgroepen samenvouwen."
-
-#~ msgid "E_nable All"
-#~ msgstr "Alles _inschakelen"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "Alle invoer-methoden inschakelen."
-
-#~ msgid "_Disable All"
-#~ msgstr "Alles _uitschakelen"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "Alle invoer-methoden uitschakelen."
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Languages"
-#~ msgstr "Talen"
-
-#~ msgid "Description"
-#~ msgstr "Omschrijving"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "Sneltoetsen voor %s instellen"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "Filter voor %s selecteren"
-
-#~ msgid "Move _Up"
-#~ msgstr "Naar _boven"
-
-#~ msgid "Move _Down"
-#~ msgstr "Naar _onderen"
-
-#~ msgid "GTK"
-#~ msgstr "GTK"
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
+msgstr ""
 
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr ""
-#~ "Een hulp-programma met panelen, gebaseert op de GTK+-2.x-bibliotheek."
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid "On demand"
-#~ msgstr "Op verzoek"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid "Never"
-#~ msgstr "Nooit"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "ToolBar"
-#~ msgstr "Werkbalk"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "_Show:"
-#~ msgstr "_Toon:"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "Auto s_nap"
-#~ msgstr "Auto s_nap"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Show _input method icon"
-#~ msgstr "Icoon voor invoer-methode tonen"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Show inp_ut method name"
-#~ msgstr "_Namen van de invoer-methoden tonen"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "Hide time_out:"
-#~ msgstr "Ontzichtbaar maken na (sec):"
+#~ msgid "English (British)"
+#~ msgstr "Engels (Groot Britannie)"
 
-#~ msgid "Show s_tick icon"
-#~ msgstr "Icoon altijd tonen"
+#~ msgid "English (American)"
+#~ msgstr "Engels (USA)"
 
-#~ msgid "Show m_enu icon"
-#~ msgstr "»_Menü« -icoon tonen"
+#, fuzzy
+#~ msgid "English (Irish)"
+#~ msgstr "Engels (Groot Britannie)"
 
-#~ msgid "Show _help icon"
-#~ msgstr "»_Help«-icoon tonen"
+#, fuzzy
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugees (Brazilie)"
 
-#~ msgid "Show _property label"
-#~ msgstr "Eigenschappen-label tonen"
+#, fuzzy
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "Malayalam"
 
-#~ msgid "Input window"
-#~ msgstr "Invoer-venster"
+#, fuzzy
+#~ msgid "Chinese (PRC)"
+#~ msgstr "Chinees"
 
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "Interne opzoek-tabel"
+#, fuzzy
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "Chinees (versimpeld)"
 
-#~ msgid "_Vertical lookup table"
-#~ msgstr "_Vertikale opzoek-tabel"
+#, fuzzy
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "Chinees (traditioneell)"
 
-#~ msgid "Misc"
-#~ msgstr "Diversen"
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "Chinees (traditioneell)"
 
-#~ msgid "Show tra_y icon"
-#~ msgstr "Toon tra_y icoon"
-
-#~ msgid "Stick _windows"
-#~ msgstr "Venster op plaats vastzetten"
-
-#~ msgid "_Font:"
-#~ msgstr "_Lettertype:"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "Wanneer \"Altijd\" is gekozen, wordt de werkbalk altijd op het scherm "
-#~ "getoond. Wanneer \"op verzoek\" is gekozen, wordt de werkbalk alleen "
-#~ "getoond wanneer SCIM aktief is. Wanneer \"Nooit\" is gekozen, wordt  de "
-#~ "werkbalk nooit getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt de werkbalk aan de rand van het "
-#~ "beeldscherm vastgeklikt"
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "De werkbalk wordt ontzichtbaar na afloop van de ingestelde tijd. Deze "
-#~ "optie is alleen beschikbaar wanneer \"altijd tonen\" is gekozen.Zet de "
-#~ "tijd op nul (0) om dit gedrag uit te schakelen."
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt het icoon van de huidige invoer-"
-#~ "methode in de werkbalk getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt de naam van de huidige invoer-"
-#~ "methode in de werkbalk getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt het sticky-icoon op de werkbalk "
-#~ "getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt het menu in de werkbalk getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt het hulp-icoon in de werkbalk "
-#~ "getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt naam van de invoer-methode getoond "
-#~ "in de werkbalk."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, wordt de opzoek-tabel in het invoer-"
-#~ "venster getoond"
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen wordt de opzoek-tabel vertikaal getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, zal het icoon van de werkbalk in het "
-#~ "systeemvak getoond."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr ""
-#~ "Wanneer deze optie is gekozen, worden de werkbalk, het invoer-venster en "
-#~ "de opzoektabel op deze plaats vastgezet."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr ""
-#~ "Dit gekozen lettertype wordt in het invoer-venster en in het opzoek-tabel "
-#~ "gebruikt."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "Interface-lettertype kiezen"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "FrontEnd"
-
-#~ msgid "IMEngine"
-#~ msgstr "Invoer-methode"
-
-#~ msgid "Panel"
-#~ msgstr "Paneel"
-
-#~ msgid "Extra"
-#~ msgstr "Extra"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "Instellingen voor de SCIM-invoer-methode"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">Smart Common Input Method-Plattform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI instellingen</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">Instellen van de %s-Module.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "Wilt U de setup van SCIM werkelijk verlaten?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "Niet alle instellingen kunnen geladen worden. SCIM moet opnieuw gestart "
-#~ "worden om alle nieuwe instellingen te laden."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "Instellen van SCIM"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr "Geïntegreerde setup dat op de GTK-widget bibiotheek is gebaseerd."
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "Setup voor de Smart Common Invoer-methode-Plattform"
-
-#~ msgid "SCIM Help"
-#~ msgstr "SCIM handboek"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "Smart Common Invoer-methode"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "Invoer-venster en de werkbalk  vastzetten/verschuifbaar maken."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "Toepasselijke help voor SCIM en de huidige invoer-methode tonen."
-
-#~ msgid "Show command menu."
-#~ msgstr "Commandoregel tonen."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(c) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid "Reload Configuration"
-#~ msgstr "Instellingen opnieuw laden"
-
-#~ msgid "Stick Windows"
-#~ msgstr "Venster vastzetten"
-
-#~ msgid "Hide Toolbar"
-#~ msgstr "Werkbalk ontzichtbaar maken"
+#, fuzzy
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "Spaans (Latijns Amerika)"
 
-#~ msgid "Help ..."
-#~ msgstr "Help ..."
+#, fuzzy
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "Spaans (Mexico)"
 
-#~ msgid "Exit"
-#~ msgstr "Afsluiten"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtueel toetsenbord ingeschakeld"
index c18add9..e0ef9bf 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Wyb. met. wprowadz."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Konfiguracja metody wprowadzania"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Wybrano %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Dostępny tylko mechanizm %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Wykryto wprowadzanie z klawiatury sprzętowej"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Dotknij, aby korzystać z wirtualnej klawiatury"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Włączono wirtualną klawiaturę"
index c18add9..956c697 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonésia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Selec. métd. introd."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de introdução"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seleccionado"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Só disponível %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Entrada detectada a partir do teclado do hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toque para usar o teclado virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclado virtual ativado"
index c18add9..0b4262d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Selec. métd. introd."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurar métodos de introdução"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seleccionado"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Só disponível %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Detectada introdução de teclado de hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Toque para utilizar o teclado virtual"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Teclado virtual activado"
index c18add9..30a1dfa 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Select. metod. intr."
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Configurare metode de introducere"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s selectat"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Este disponibil doar %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Intrare detectată de la tastatura hardware"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Atingeţi pentru a utiliza tastatura virtuală"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Tastatură virtuală activată"
index c18add9..cdb7db4 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Выбор метода ввода"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Настроить методы ввода"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Выбрано: %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Доступно только %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Обнаружен ввод с физической клавиатуры"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Коснитесь для использования виртуальной клавиатуры"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Виртуальная клавиатура включена"
index 79a80b2..f524c55 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,37 +778,68 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
 msgstr ""
 
 #: ism/utils/scimstringview.c:201
@@ -1016,115 +1010,151 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
index c18add9..c6dda80 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Vybrať metódu vstupu"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Nastaviť spôsoby zadávania textu"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Vybrali ste %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "K dispozícii je iba %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Zistil sa vstup z hardvérovej klávesnice"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Ťuknutím môžete použiť virtuálnu klávesnicu"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuálna klávesnica je zapnutá"
index c18add9..66a816b 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Izberite način vnosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Nastavi načine vnosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s izbranih"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Na voljo je samo %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Zaznan je vnos s strojno tipkovnico"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Pritisnite za uporabo navidezne tipkovnice"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Navidezna tipkovnica je omogočena"
index c18add9..84cdb9a 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Izaberi način unosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Konfiguriši načine unosa"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Izabran je %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Samo %s je dostupan"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Unesi neku od detektovanih hardverskih tastatura"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Kucni za korišćenje virtuelne tastature"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Omogućena je virtuelna tastatura"
index c18add9..891447e 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Välj inmatningsmetod"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Ställ in inmatningsmetoder"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s markerade"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Bara %s tillgängligt"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Inmatning från fysiskt tangentbord har identifierats"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Tryck om du vill använda det virtuella tangentbordet"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtuellt tangentbord har aktiverats"
index 788bc2c..97dfc4d 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 13:04-0400\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:765
-#: ism/src/scim_panel_agent.cpp:370 ism/src/scim_panel_agent.cpp:3843
-#: ism/src/scim_utility.cpp:706
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
@@ -29,692 +29,651 @@ msgstr ""
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:709 ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:711
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:712 ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714 ism/src/scim_utility.cpp:882
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:715 ism/src/scim_utility.cpp:716
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:717
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:718
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:719
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:861
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:721 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:931
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:723 ism/src/scim_utility.cpp:862
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:832
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:725
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:728 ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:730
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:732
-msgid "English (American)"
-msgstr ""
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:733
+#: ism/src/scim_utility.cpp:811
 msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:734 ism/src/scim_utility.cpp:735
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:736
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:739
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:826
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_utility.cpp:929
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:744 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:745 ism/src/scim_utility.cpp:754
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:872
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:749
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:750
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:751
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:753 ism/src/scim_utility.cpp:837
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:890
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:756 ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:883
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:758
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:759
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:763 ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:764 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:765 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:767 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:770
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:812
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:772
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:773
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:774
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:779
-#: ism/src/scim_utility.cpp:840 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:780 ism/src/scim_utility.cpp:874
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:885
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:782 ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
 msgid "Sindhi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:930
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:876
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:786 ism/src/scim_utility.cpp:877
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:787
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:789
-#: ism/src/scim_utility.cpp:790
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:791 ism/src/scim_utility.cpp:793
-#: ism/src/scim_utility.cpp:869 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:870
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796 ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:888
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799 ism/src/scim_utility.cpp:887
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:802 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:804 ism/src/scim_utility.cpp:805
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:808
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:815
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:819
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:825
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:830
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:834
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:835
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:841
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:842
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:855
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:857
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:858
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:866
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:886
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:889
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:893
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:896
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:928
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:932
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:933
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:934
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1032
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
@@ -762,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -823,51 +778,67 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:969
-msgid "Enable"
-msgstr ""
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "เลือก​วิธี​เขียน"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "ตั้ง​ค่า​วิธี​เขียน"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:990
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:389
-msgid "Virtual keyboard is on"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:422
-#: ism/extras/efl_panel/isf_panel_efl.cpp:488
-#: ism/extras/efl_panel/isf_panel_efl.cpp:499
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "เลือก %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "พร้อมใช้งานเฉพาะ %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
 msgid "Input detected from hardware keyboard"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:430
-#: ism/extras/efl_panel/isf_panel_efl.cpp:493
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
 msgid "Tap to use virtual keyboard"
 msgstr ""
 
@@ -1039,145 +1010,136 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
 #. Number Only with signed Layout
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
 #. Number Only with decimal Layout
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
 #. Number Only with signed and decimal Layout
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
 #. Datetime Layout
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "click to enter DATETIME"
 msgstr ""
 
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
 #. Terminal Layout
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "click to enter TERMINAL"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:289
+#: ism/demos/isf_layout_efl.cpp:304
 msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:170
-msgid "Previous"
-msgstr ""
-
-#. service_add_extra_data (ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:172
-msgid "Next"
-msgstr ""
-
-#: ism/demos/isf_demo_efl.cpp:201
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
index c18add9..d3027da 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Giriş yöntemi seç"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Giriş yöntemlerini ayarla"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s seçildi"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Yalnızca %s kullanılabilir"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Donanım klavyesinden giriş algılandı"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Sanal klavyeyi kullanmak için dokun"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Sanal klavye etkinleştirildi"
index c18add9..9f82a43 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Виб. методу введення"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Настроювання способів введення"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "Вибрано словник %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Доступно лише %s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Визначено введення з апаратної клавіатури"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Натисніть, щоб скористатися віртуальною клавіатурою"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Віртуальну клавіатуру увімкнено"
index 788bc2c..c2a0726 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 13:04-0400\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:765
-#: ism/src/scim_panel_agent.cpp:370 ism/src/scim_panel_agent.cpp:3843
-#: ism/src/scim_utility.cpp:706
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
@@ -29,692 +29,651 @@ msgstr ""
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:709 ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:711
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:712 ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714 ism/src/scim_utility.cpp:882
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:715 ism/src/scim_utility.cpp:716
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:717
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:718
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:719
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:861
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:721 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:931
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:723 ism/src/scim_utility.cpp:862
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:832
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:725
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:728 ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:730
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:732
-msgid "English (American)"
-msgstr ""
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:733
+#: ism/src/scim_utility.cpp:811
 msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:734 ism/src/scim_utility.cpp:735
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:736
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
+
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:739
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:826
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_utility.cpp:929
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:744 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:745 ism/src/scim_utility.cpp:754
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:872
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:749
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:750
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:751
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:753 ism/src/scim_utility.cpp:837
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:890
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:756 ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:883
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:758
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:759
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:763 ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:764 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:765 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:767 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:770
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:812
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:772
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:773
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:774
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:779
-#: ism/src/scim_utility.cpp:840 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:780 ism/src/scim_utility.cpp:874
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:885
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:782 ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
 msgid "Sindhi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:930
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:876
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:786 ism/src/scim_utility.cpp:877
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:787
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:789
-#: ism/src/scim_utility.cpp:790
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:791 ism/src/scim_utility.cpp:793
-#: ism/src/scim_utility.cpp:869 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:870
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796 ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:888
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799 ism/src/scim_utility.cpp:887
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:802 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:804 ism/src/scim_utility.cpp:805
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:808
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:815
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:819
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:825
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:830
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:834
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:835
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:841
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:842
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:855
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:857
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:858
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:866
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:886
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:889
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:893
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:896
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:928
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:932
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:933
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:934
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1032
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
@@ -762,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -823,51 +778,67 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:969
-msgid "Enable"
-msgstr ""
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "ان پٹ طریقہ منتخب کریں"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "ان پٹ کے طریقے کار سیٹ اپ کریں"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:990
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:389
-msgid "Virtual keyboard is on"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:422
-#: ism/extras/efl_panel/isf_panel_efl.cpp:488
-#: ism/extras/efl_panel/isf_panel_efl.cpp:499
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s منتخب ہوگئے"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "صرف %s دستیاب"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
 msgid "Input detected from hardware keyboard"
 msgstr ""
 
-#: ism/extras/efl_panel/isf_panel_efl.cpp:430
-#: ism/extras/efl_panel/isf_panel_efl.cpp:493
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
 msgid "Tap to use virtual keyboard"
 msgstr ""
 
@@ -1039,145 +1010,136 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:207
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:211
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:215
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:219
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:223
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:227
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:231
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:235
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
 #. Number Only with signed Layout
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:239
+#: ism/demos/isf_layout_efl.cpp:244
 msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
 #. Number Only with decimal Layout
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:243
+#: ism/demos/isf_layout_efl.cpp:248
 msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
 #. Number Only with signed and decimal Layout
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:247
+#: ism/demos/isf_layout_efl.cpp:252
 msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
 #. Datetime Layout
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:251
+#: ism/demos/isf_layout_efl.cpp:256
 msgid "click to enter DATETIME"
 msgstr ""
 
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:255
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
 #. Terminal Layout
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:259
+#: ism/demos/isf_layout_efl.cpp:264
 msgid "click to enter TERMINAL"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:289
+#: ism/demos/isf_layout_efl.cpp:304
 msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:170
-msgid "Previous"
-msgstr ""
-
-#. service_add_extra_data (ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:172
-msgid "Next"
-msgstr ""
-
-#: ism/demos/isf_demo_efl.cpp:201
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
index c18add9..d5bec37 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr ""
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr ""
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr ""
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr ""
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr ""
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr ""
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr ""
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr ""
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr ""
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr ""
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr ""
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr ""
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr ""
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr ""
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr ""
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr ""
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "Kir. usulini tanlang"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "Kiritish usullarini o‘rnatish"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s танланган"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "Faqat %s mavjud"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "Apparat klaviaturasidan kiritish aniqlandi"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "Virtual klaviaturadan foydalanish uchun cherting"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "Virtual klaviatura yoqildi"
index b1d0e9c..8557d2f 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2004-06-20 14:57+0800\n"
 "Last-Translator: James Su <suzhe@tsinghua.org.cn>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -16,705 +16,671 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "英语键盘"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr "英语输入"
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "阿拉伯语"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "阿拉伯语(埃及)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "阿拉伯语(黎巴嫩)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "阿萨姆语"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "白俄罗斯语"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "孟加拉语"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "孟加拉语(印度)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "西藏语"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "波斯尼亚语"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "威尔士语"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr "迪维希语"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "英语(澳大利亚)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "英语(加拿大)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "英语(不列颠)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "英语(爱尔兰)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "英语(美国)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "西班牙语(墨西哥)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "波斯语"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "爱尔兰语"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "古吉拉特语"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "希伯来语"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "印地语"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "拉丁国际语"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "印度尼西亚语"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "日"
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "柬埔寨语"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "卡纳达语"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "老挝语"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "马其顿语"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "马拉雅拉姆语"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "蒙古语"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "马拉地语"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "马来语"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "缅甸语"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr "挪威语(尼诺斯克)"
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "挪威语(博克马尔)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "奥里雅语"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "旁遮普语"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "僧伽罗语"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "阿尔巴尼亚语"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "塞尔维亚语"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "瑞典语(芬兰)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "泰米尔语"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "泰卢固语"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "泰语"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "维吾尔语"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "乌尔都语"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "乌兹别克语"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "越南语"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "华隆语"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "意第绪语"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "中文"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr "简体中文"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr "中文(香港)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr "繁体中文"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr "荷兰语(比利时)"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr "英语(新西兰)"
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr "英语(爱尔兰)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr "英语(南非)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr "英语(牙买加)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr "英语(伯利兹)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr "英语(特立尼达)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr "英语(津巴布韦)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr "英语(菲律宾)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr "法语(比利时)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr "德语(瑞士)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr "法语(卢森堡)"
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr "法语(摩纳哥)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "德语(瑞士)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr "德语(澳大利亚)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr "德语(卢森堡)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr "德语(列支敦士登)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr "意大利语(瑞士)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙语(巴西)"
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr "西班牙语(传统)"
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr "西班牙语(墨西哥)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr "西班牙语(危地马拉)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr "西班牙语(哥斯达黎加)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr "西班牙语(巴拿马)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr "西班牙语(多米尼加共和国)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr "西班牙语(委内瑞拉)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr "西班牙语(哥伦比亚)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr "西班牙语(秘鲁)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr "西班牙语(阿根廷)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr "西班牙语(厄瓜多尔)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr "西班牙语(智利)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr "西班牙语(乌拉圭)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr "西班牙语(巴拉圭)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr "西班牙语(玻利维亚)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr "西班牙语(萨尔瓦多)"
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr "西班牙语(洪都拉斯)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr "西班牙语(尼加拉瓜)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr "西班牙语(波多黎各)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr "南非语"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr "马来语(马来西亚)"
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr "马来语(文莱)"
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "挪威语"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr "塞尔维亚语(西里尔)"
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr "乌兹别克语(拉丁)"
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr "中文(台湾)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "中文(香港)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr "中文(澳门)"
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr "中文(中国)"
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr "中文(新加坡)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr "阿拉伯语(沙特阿拉伯)"
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr "阿拉伯语(伊拉克)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr "阿拉伯语(利比亚)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr "阿拉伯语(阿尔及利亚)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯语(摩洛哥)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr "阿拉伯语(突尼斯)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr "阿拉伯语(阿曼)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr "阿拉伯语(也门)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr "阿拉伯语(叙利亚)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr "阿拉伯语(约旦)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr "阿拉伯语(科威特)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr "阿拉伯语(阿联酋)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr "阿拉伯语(巴林)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr "阿拉伯语(卡塔尔)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr "豪萨语"
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr "科萨语"
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr "约鲁巴语"
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr "祖鲁语"
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "其它语言"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "未知"
 
@@ -754,10 +720,6 @@ msgstr "斯洛伐克(标准键盘)"
 msgid "Spanish (CP 850)"
 msgstr "西班牙语(CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "西班牙语(拉丁美洲)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "英语(英国)"
@@ -815,11 +777,11 @@ msgstr "简->繁"
 msgid "TC->SC"
 msgstr "繁->简"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "智能通用输入法平台"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -829,27 +791,58 @@ msgstr ""
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "激活"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "选择输入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "设置输入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "名称"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "已选择%s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "仅限 %s 可用"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "已从硬件键盘检测到输入"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "轻敲以使用虚拟键盘"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1021,1193 +1014,191 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
 msgstr ""
 
-#~ msgid "English/European"
-#~ msgstr "英语/欧洲语"
-
-#~ msgid "RAW CODE"
-#~ msgstr "内码输入"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "热键:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    切换本地编码和 Unicode 编码模式.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    复位输入法.\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "当前输入法的状态, 点击切换状态."
-
-#~ msgid "Unicode"
-#~ msgstr "统一码"
-
-#~ msgid "Global Setup"
-#~ msgstr "全局设置"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "设置所有前端模块使用的全局选项,包括 X11前端, GTK 输入法模块, QT 输入法模"
-#~ "块 等."
-
-#~ msgid "_Trigger:"
-#~ msgstr "开关键(_T):"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "选择输入法开关键"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用以打开/关闭 SCIM 输入法的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "Turn _On:"
-#~ msgstr "打开键(_O):"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "选择输入法打开键"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用以打开 SCIM 输入法的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "关闭键(_F):"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "选择输入法关闭键"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用以关闭 SCIM 输入法的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "_Next input method:"
-#~ msgstr "后一个输入法(_N):"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "选择后一个输入法按键"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用以切换到后一个输入法的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "_Previous input method:"
-#~ msgstr "前一个输入法(_P):"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "选择前一个输入法按键"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr "用以切换到前一个输入法的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "显示输入法菜单(_M):"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "选择显式输入法菜单按键"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用以显式输入法菜单的按键. 点击右边的按钮进行编辑."
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr ""
-#~ "你应当在这里选择你正在使用的键盘布局, 以保证那些依赖于键盘布局的输入法能够"
-#~ "正确的运行."
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "将预编辑字符串嵌入到客户窗口中(_E)"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "如果选中这个选项, 预编辑字符串将被直接显示在客户端输入窗口中,而不是在独立"
-#~ "的浮动窗口中."
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "在所有应用程序中共享同一个输入法(_S)"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "如果选中这个选项, 则同一时刻仅能在所有应用程序中使用同一个输入法. 否则各个"
-#~ "应用程序可以使用不同的输入法."
-
-#~ msgid "Hotkeys"
-#~ msgstr "热键"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr "你可以在这里激活/禁止输入法, 并为输入法设置热键."
-
-#~ msgid "The installed input method services:"
-#~ msgstr "已安装的输入法服务:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "编辑热键(_H)"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "编辑与选中的输入法相关联的热键."
-
-#~ msgid "Select _Filters"
-#~ msgstr "选择过滤器(_F)"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "选择要附加到这个输入法上的过滤器."
-
-#~ msgid "_Expand"
-#~ msgstr "展开(_E)"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "展开所有语言分类."
-
-#~ msgid "_Collapse"
-#~ msgstr "折叠(_C)"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "折叠所有语言分类."
-
-#~ msgid "E_nable All"
-#~ msgstr "激活所有(_N)"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "激活所有输入法."
-
-#~ msgid "_Disable All"
-#~ msgstr "禁止所有(_D)"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "禁止所有输入法."
-
-#~ msgid "Filters"
-#~ msgstr "过滤器"
-
-#~ msgid "Description"
-#~ msgstr "描述"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "编辑 %s 的热键"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "为 %s 选择过滤器"
-
-#~ msgid "Move _Up"
-#~ msgstr "向上移动(_U)"
-
-#~ msgid "Move _Down"
-#~ msgstr "向下移动(_D)"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "一个基于 GTK+-2.x 库的面板服务程序."
-
-#~ msgid "On demand"
-#~ msgstr "需要时"
-
-#~ msgid "Never"
-#~ msgstr "从不"
-
-#~ msgid "ToolBar"
-#~ msgstr "工具条"
-
-#~ msgid "_Show:"
-#~ msgstr "显示(_S):"
-
-#~ msgid "Auto s_nap"
-#~ msgstr "自动靠边(_N)"
-
-#~ msgid "Show _input method icon"
-#~ msgstr "显示输入法图标(_I)"
-
-#~ msgid "Show inp_ut method name"
-#~ msgstr "显示输入法名称(_U)"
-
-#~ msgid "Hide time_out:"
-#~ msgstr "隐藏超时(_O):"
-
-#~ msgid "Show s_tick icon"
-#~ msgstr "显示粘住图标(_T)"
-
-#~ msgid "Show m_enu icon"
-#~ msgstr "显示菜单图标(_E)"
-
-#~ msgid "Show _help icon"
-#~ msgstr "显示帮助图标(_H)"
-
-#~ msgid "Show _property label"
-#~ msgstr "显示属性标签(_P)"
-
-#~ msgid "Input window"
-#~ msgstr "输入窗口"
-
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "嵌入式候选词表(_M)"
-
-#~ msgid "_Vertical lookup table"
-#~ msgstr "垂直式候选词表(_V)"
-
-#~ msgid "Misc"
-#~ msgstr "其它"
-
-#~ msgid "Show tra_y icon"
-#~ msgstr "显示托盘图标(_Y)"
-
-#~ msgid "Stick _windows"
-#~ msgstr "粘住窗口(_W)"
-
-#~ msgid "_Font:"
-#~ msgstr "字体(_F):"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "如果选中 \"永远\" 选项, 工具条将被永远显示在屏幕上. 如果选中 \"需要时\" 选"
-#~ "项, 则只有当SCIM被激活时才会显示工具条. 如果选中 \"从不\" 选项, 则工具条永"
-#~ "远不会被显示."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr "如果选中这个选项, 工具条将粘附在屏幕边缘上."
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "当超时过后, 工具条将被隐藏起来. 该选项只在 \"永远显示\" 被选中时才生效. 设"
-#~ "置成 0 则禁止此功能."
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果选中这个选项, 输入法图标将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果选中这个选项, 输入法名称将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr "如果选中这个选项, 粘住图标将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr "如果选中这个选项, 菜单图标将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr "如果选中这个选项, 帮助图标将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr "如果选中这个选项, 则输入法屬性的文字标签将显示在工具条上."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr "如果选中这个选项, 候选词表将被嵌入到输入窗口中."
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr "如果选中这个选项, 将垂直显示候选词表."
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr "如果选中这个选项, 托盘图标将显示在桌面的任务栏上."
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr "如果选中这个选项, 则输入和候选词表窗口将停在它们的原始位置."
-
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr "该字体设置将用于输入和候选词表窗口."
-
-#~ msgid "Select Interface Font"
-#~ msgstr "选择界面字体"
-
-#~ msgid "FrontEnd"
-#~ msgstr "前端"
-
-#~ msgid "IMEngine"
-#~ msgstr "输入法引擎"
-
-#~ msgid "Panel"
-#~ msgstr "面板"
-
-#~ msgid "Extra"
-#~ msgstr "附加"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "SCIM 输入法设置"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">智能通用输入法平台</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">图形设置工具</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">版权所有 2002-2004, 苏  哲&lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">%s模块的设置.</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "你确定要退出 SCIM 设置程序么?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr ""
-#~ "不是所有配置都能够直接重新加载. 别忘了重新启动 SCIM 以使所有新的配置生效."
-
-#~ msgid "SCIM Setup"
-#~ msgstr "SCIM 设置"
-
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr "基于 GTK 控件库的集成设置工具."
-
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "智能通用输入法平台的设置工具"
-
-#~ msgid "SCIM Help"
-#~ msgstr "SCIM 帮助"
-
-#~ msgid "Smart Common Input Method"
-#~ msgstr "智能通用输入法平台"
-
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "粘住/放开 输入窗口和工具条."
-
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "显示关于 SCIM 和当前输入法的简单帮助."
-
-#~ msgid "Show command menu."
-#~ msgstr "显示命令菜单."
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-
-#~ msgid "Reload Configuration"
-#~ msgstr "重新加载配置"
-
-#~ msgid "Stick Windows"
-#~ msgstr "粘住窗口"
-
-#~ msgid "Hide Toolbar"
-#~ msgstr "隱藏工具条"
-
-#~ msgid "Help ..."
-#~ msgstr "帮助 ..."
-
-#~ msgid "Exit"
-#~ msgstr "退出"
-
-#~ msgid "En"
-#~ msgstr "英"
-
-#~ msgid "_Switch input method globally"
-#~ msgstr "显示输入法图标(_I)"
-
-#~ msgid "Preedit String mode"
-#~ msgstr "预编辑字符串模式"
-
-#~ msgid "X Window"
-#~ msgstr "X 窗口"
-
-#~ msgid "A FrontEnd module for X11R6 Window System, using XIM Protocol."
-#~ msgstr "一个用于 X11R6 窗口系统的前端模块, 使用 XIM 协议."
-
-#~ msgid "_On The Spot"
-#~ msgstr "在光标处预编辑(_O)"
-
-#~ msgid "_Dynamic Event Flow"
-#~ msgstr "动态事件流(_D)"
-
-#~ msgid ""
-#~ "If this option is checked, the OnTheSpot input style will be used when "
-#~ "the client supports it."
-#~ msgstr ""
-#~ "如果选中这个选项, 当客户端支持时, 预编辑字符串将显示在光标位置上, 即 On "
-#~ "The Spot 模式."
-
-#~ msgid ""
-#~ "If this option is checked, then dynamic event flow will be used.This can "
-#~ "speed up the key event response, especially in remote X11 environment.But "
-#~ "SCIM may become unstable."
-#~ msgstr ""
-#~ "如果选中这个选项, 则会使用动态事件流. 这可以加快按键事件的响应速度, 特别是"
-#~ "在远程 X11 环境中. 但 SCIM 可能会变得不稳定."
-
-#~ msgid "Slovene"
-#~ msgstr "斯洛文尼亚语"
-
-#~ msgid "Global"
-#~ msgstr "全局设置"
-
-#~ msgid "Hot Keys"
-#~ msgstr "热键"
-
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2004 James Su <suzhe@tsinghua.org.cn>\n"
-#~ "\n"
-#~ "Hot keys:\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "\n"
-#~ "(C) 2002-2004 James Su <suzhe@tsinghua.org.cn>\n"
-#~ "\n"
-#~ "热键:\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    open/close the input method.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ ":\n"
-#~ "    打开/关闭输入法.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    switch to the next input method.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ ":\n"
-#~ "    切换到下一个输入法.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ ":\n"
-#~ "    switch to the previous input method.\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ ":\n"
-#~ "    切换到前一个输入法.\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Full/Half Letter"
-#~ msgstr "全/半角字符"
-
-#~ msgid "Full/Half Punct"
-#~ msgstr "全/半角标点"
-
-#~ msgid ""
-#~ "The input mode of the letters. Click to toggle between half and full."
-#~ msgstr "字母输入模式. 点击以切换全角/半角模式."
-
-#~ msgid ""
-#~ "The input mode of the puncutations. Click to toggle between half and full."
-#~ msgstr "标点输入模式. 点击以切换全角/半角模式."
-
-#~ msgid ""
-#~ "    Switch between full/half width letter mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    切换全角和半角字符状态.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Switch between full/half width punctuation mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    切换全角和半角标点符号状态.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Switch between Forward/Input mode.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    切换 转发/输入 模式.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Add a new phrase.\n"
-#~ "\n"
-#~ "  "
-#~ msgstr ""
-#~ "    添加一个新词.\n"
-#~ "\n"
-#~ "  "
-
-#~ msgid ""
-#~ "    Delete the selected phrase.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "    删除选中的词语.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Control+Down:\n"
-#~ "    Move lookup cursor to next shorter phrase\n"
-#~ "    Only available when LongPhraseFirst option is set.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Control+Down:\n"
-#~ "    将候选词表的光标移动到下一个更短的词\n"
-#~ "    只在打开 LongPhraseFirst 选项的时候才生效.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Control+Up:\n"
-#~ "    Move lookup cursor to previous longer phrase\n"
-#~ "    Only available when LongPhraseFirst option is set.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Control+Up:\n"
-#~ "    将候选词表的光标移动到前一个更长的词\n"
-#~ "    只在打开 LongPhraseFirst 选项的时候才生效.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Esc:\n"
-#~ "    复位输入法.\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "How to add a phrase:\n"
-#~ "    Input the new phrase as normal, then press the\n"
-#~ "  hot key. A hint will be shown to let you input a key\n"
-#~ "  for this phrase.\n"
-#~ "    Input a key then press the space bar.\n"
-#~ "  A hint will be shown to indicate whether\n"
-#~ "  the phrase was added sucessfully.\n"
-#~ msgstr ""
-#~ "怎样添加一个词语:\n"
-#~ "    首先在正常状态下输入新词, 然后按添加词语快捷键.\n"
-#~ "  将会显示一个提示让你为这个词语输入一个键串.\n"
-#~ "    输入键串后按空格键. 会有一个提示说明加词\n"
-#~ "  是否成功.\n"
-
-#~ msgid "Input a key string for phrase: "
-#~ msgstr "为这个词输入一个键串: "
-
-#~ msgid "Success."
-#~ msgstr "成功."
-
-#~ msgid "Failed."
-#~ msgstr "失败."
-
-#~ msgid "Generic Table"
-#~ msgstr "通用码表"
-
-#~ msgid "An IMEngine Module which uses generic table input method file."
-#~ msgstr "一个使用通用码表输入法文件的输入法引擎模块."
-
-#~ msgid "Full width _punctuation:"
-#~ msgstr "全/半角标点切换(_P):"
-
-#~ msgid "Select full width puncutation keys"
-#~ msgstr "选择全/半角标点状态切换键"
-
-#~ msgid ""
-#~ "The key events to switch full/half width punctuation input mode. Click on "
-#~ "the button on the right to edit it."
-#~ msgstr "用以切换全/半角标点输入模式的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "Full width _letter:"
-#~ msgstr "全/半角字母切换(_L):"
-
-#~ msgid "Select full width letter keys"
-#~ msgstr "选择全/半角字母状态切换键"
-
-#~ msgid ""
-#~ "The key events to switch full/half width letter input mode. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr "用以切换全/半角字母输入模式的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "_Mode switch:"
-#~ msgstr "输入模式切换(_M):"
-
-#~ msgid "Select mode switch keys"
-#~ msgstr "选择输入模式切换键"
-
-#~ msgid ""
-#~ "The key events to change current input mode. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用以切换当前输入模式的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "_Add phrase:"
-#~ msgstr "添加词语(_A):"
-
-#~ msgid "Select add phrase keys."
-#~ msgstr "选择添加词语键"
-
-#~ msgid ""
-#~ "The key events to add a new user defined phrase. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用以添加用户自定义词语的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "_Delete phrase:"
-#~ msgstr "删除词语(_D):"
-
-#~ msgid "Select delete phrase keys."
-#~ msgstr "选择删除词语键"
-
-#~ msgid ""
-#~ "The key events to delete a selected phrase. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用以删除选中词语的按键. 点击右边的按钮进行编辑."
-
-#~ msgid "Show _prompt"
-#~ msgstr "显示提示(_P)"
-
-#~ msgid "Show key _hint"
-#~ msgstr "显示逐键提示(_H)"
-
-#~ msgid "Save _user table in binary format"
-#~ msgstr "以二进制格式保存用户码表(_U)"
-
-#~ msgid "Show the u_ser defined phrases first"
-#~ msgstr "优先显示用户自定义的词语(_S)"
-
-#~ msgid "Show the _longer phrases first"
-#~ msgstr "优先显示较长的词语(_L)"
-
-#~ msgid ""
-#~ "If this option is checked, the key prompt of the currently selected "
-#~ "phrase will be shown."
-#~ msgstr "如果选中这个选项, 则显示当前词语按键的提示信息."
-
-#~ msgid ""
-#~ "If this option is checked, the remaining keystrokes of the phraseswill be "
-#~ "shown on the lookup table."
-#~ msgstr "如果选中这个选项, 将在候选词表中显示每个词语剩下需要输入的按键."
-
-#~ msgid ""
-#~ "If this option is checked, the user table will be stored with binary "
-#~ "format, this will increase the loading speed."
-#~ msgstr "如果选中这个选项, 用户码表将以二进制格式存储, 这会提高调入速度."
-
-#~ msgid ""
-#~ "If this option is checked, the user defined phrases will be shown in "
-#~ "front of others. "
-#~ msgstr "如果选中这个选项, 将优先显示用户自定义的词语."
-
-#~ msgid ""
-#~ "If this option is checked, the longer phrase will be shown in front of "
-#~ "others. "
-#~ msgstr "如果选中这个选项, 将优先显示较长的词语."
-
-#~ msgid "The installed tables:"
-#~ msgstr "已安装的码表:"
-
-#~ msgid "_Install"
-#~ msgstr "安装(_I)"
-
-#~ msgid "Install a new table."
-#~ msgstr "安装一个新码表."
-
-#~ msgid "_Delete"
-#~ msgstr "删除(_D)"
-
-#~ msgid "Delete the selected table."
-#~ msgstr "删除选中的码表."
-
-#~ msgid "_Properties"
-#~ msgstr "属性(_P)"
-
-#~ msgid "Edit the properties of the selected table."
-#~ msgstr "编辑选中的码表的属性."
-
-#~ msgid "Table Management"
-#~ msgstr "码表管理"
-
-#~ msgid "Select an icon file"
-#~ msgstr "选择一个图标文件"
-
-#~ msgid "User"
-#~ msgstr "用户"
-
-#~ msgid "System"
-#~ msgstr "系统"
-
-#~ msgid "Please select the table file to be installed."
-#~ msgstr "请选择要安装的码表文件."
-
-#~ msgid "Failed to install the table! It's already in table file directory."
-#~ msgstr "码表安装失败! 它已经被安装到码表目录中了."
-
-#~ msgid "Failed to load the table file!"
-#~ msgstr "无法调入码表文件!"
-
-#~ msgid ""
-#~ "Failed to install the table! Another version of this table was already "
-#~ "installed."
-#~ msgstr "码表安装失败! 这个码表的另外一个版本已经被安装过了."
-
-#~ msgid ""
-#~ "Another version of this table was already installed. Do you want to "
-#~ "replace it with the new one?"
-#~ msgstr "已经安装了这个码表的另外一个版本. 你想用新码表替换原来那个么?"
-
-#~ msgid ""
-#~ "Failed to install the table! A table with the same file name was already "
-#~ "installed."
-#~ msgstr "码表安装失败! 一个有相同文件名的码表已经被安装."
-
-#~ msgid ""
-#~ "A table with the same file name was already installed. Do you want to "
-#~ "overwrite it?"
-#~ msgstr "一个有相同文件名的码表已经被安装. 你想覆盖它么?"
-
-#~ msgid "Failed to install the table to %s!"
-#~ msgstr "将码表安装到 %s 失败!"
-
-#~ msgid "Can not delete the file %s!"
-#~ msgstr "无法删除文件 %s!"
-
-#~ msgid "Are you sure to delete this table file?"
-#~ msgstr "你确认删除这个码表文件?"
-
-#~ msgid "Failed to delete the table file!"
-#~ msgstr "码表文件删除失败!"
-
-#~ msgid "True"
-#~ msgstr "真"
-
-#~ msgid "False"
-#~ msgstr "假"
-
-#~ msgid "Split Keys:"
-#~ msgstr "分隔键:"
-
-#~ msgid "The key strokes to split inputed string."
-#~ msgstr "用于分隔输入字符串的按键."
-
-#~ msgid "Commit Keys:"
-#~ msgstr "提交键:"
-
-#~ msgid "The key strokes to commit converted result to client."
-#~ msgstr "用于将转换结果提交给客户程序的按键."
-
-#~ msgid "Forward Keys:"
-#~ msgstr "转发键:"
-
-#~ msgid "The key strokes to forward inputed string to client."
-#~ msgstr "用于将已输入的字符串转发给客户程序的按键."
-
-#~ msgid "The key strokes to select candidate phrases in lookup table."
-#~ msgstr "在候选词表中选择候选词的按键."
-
-#~ msgid "Page Up Keys:"
-#~ msgstr "向上翻页键:"
-
-#~ msgid "The lookup table page up keys"
-#~ msgstr "候选词表向上翻页键"
-
-#~ msgid "Page Down Keys:"
-#~ msgstr "向下翻页键:"
-
-#~ msgid "The lookup table page down keys"
-#~ msgstr "候选词表向下翻页键"
-
-#~ msgid "Table Properties"
-#~ msgstr "码表属性"
-
-#~ msgid "Name:"
-#~ msgstr "名称:"
-
-#~ msgid "The name of this table."
-#~ msgstr "这个码表的名称."
-
-#~ msgid "Author:"
-#~ msgstr "作者:"
-
-#~ msgid "The author of this table."
-#~ msgstr "这个码表的作者."
-
-#~ msgid "UUID:"
-#~ msgstr "唯一号:"
-
-#~ msgid "The unique ID of this table."
-#~ msgstr "这个码表的唯一号."
-
-#~ msgid "Serial Number:"
-#~ msgstr "系列号:"
-
-#~ msgid "The serial number of this table."
-#~ msgstr "这个码表的系列号."
-
-#~ msgid "Icon File:"
-#~ msgstr "图标文件:"
-
-#~ msgid "The icon file of this table."
-#~ msgstr "这个码表的图标文件."
-
-#~ msgid "Supported Languages:"
-#~ msgstr "支持的语言:"
-
-#~ msgid "The languages supported by this table."
-#~ msgstr "这个码表支持的语言."
-
-#~ msgid "Status Prompt:"
-#~ msgstr "状态提示:"
-
-#~ msgid "A prompt string to be shown in status area."
-#~ msgstr "要显示在状态区中的提示字符串."
-
-#~ msgid "Valid Input Chars:"
-#~ msgstr "合法的输入字符:"
-
-#~ msgid "The valid input chars of this table."
-#~ msgstr "这个码表的合法的输入字符."
-
-#~ msgid "Multi Wildcard Char:"
-#~ msgstr "多重扩展字符:"
-
-#~ msgid ""
-#~ "The multi wildcard chars of this table. These chars can be used to match "
-#~ "one or more arbitrary chars."
-#~ msgstr "这个码表的多重扩展字符. 这些字符可以用来匹配一个或多个任意字符."
-
-#~ msgid "Single Wildcard Char:"
-#~ msgstr "单一扩展字符:"
-
-#~ msgid ""
-#~ "The single wildcard chars of this table.These chars can be used to match "
-#~ "one arbitrary char."
-#~ msgstr "这个码表的单一扩展字符. 这些字符可以用于匹配一个任意字符."
-
-#~ msgid "Max Key Length:"
-#~ msgstr "最大键长度:"
-
-#~ msgid "The maxmium length of key strings."
-#~ msgstr "键串的最大长度."
-
-#~ msgid "Show Key Prompt:"
-#~ msgstr "显示键提示:"
-
-#~ msgid "If true then the key prompts will be shown instead of the raw keys."
-#~ msgstr "如果选中这个选项, 则显式键的提示而不是原始的键."
-
-#~ msgid "Auto Select:"
-#~ msgstr "自动选择:"
-
-#~ msgid ""
-#~ "If true then the first candidate phrase will be selected automatically "
-#~ "when inputing the next key."
-#~ msgstr "如果为真, 则在输入下一个键的时候, 第一个候选词将被自动选择."
-
-#~ msgid "Auto Wildcard:"
-#~ msgstr "自动扩展:"
-
-#~ msgid ""
-#~ "If true then a multi wildcard char will be append to the end of inputed "
-#~ "key string when searching phrases."
-#~ msgstr ""
-#~ "如果为真, 则会在搜索词语的时候, 在已输入的键串后附加一个多重扩展字符."
-
-#~ msgid "Auto Commit:"
-#~ msgstr "自动提交:"
-
-#~ msgid ""
-#~ "If true then the converted result string will be committed to client "
-#~ "automatically."
-#~ msgstr "如果为真, 则转换结果字符串将被自动提交到客户程序."
-
-#~ msgid ""
-#~ "If true then the inputed key string will be splitted automatically when "
-#~ "necessary."
-#~ msgstr "如果为真, 则当有需要的时候, 自动分隔输入的键串."
-
-#~ msgid "Discard Invalid Key:"
-#~ msgstr "丢弃无效键:"
-
-#~ msgid ""
-#~ "If true then the invalid key will be discarded automatically.This option "
-#~ "is only valid when Auto Select and Auto Commit is true."
-#~ msgstr ""
-#~ "如果为真, 则无效键将被自动丢弃. 此选项仅在自动选择和自动提交选项开启时有"
-#~ "效."
-
-#~ msgid "Dynamic Adjust:"
-#~ msgstr "动态调整:"
-
-#~ msgid "If true then the phrases' frequencies will be adjusted dynamically."
-#~ msgstr "如果为真, 则会动态调整词语的频率信息."
-
-#~ msgid "Auto Fill Preedit Area:"
-#~ msgstr "自动填充预编辑区:"
-
-#~ msgid ""
-#~ "If true then the preedit string will be filled up with the current "
-#~ "candiate phrase automatically.This option is only valid when Auto Select "
-#~ "is TRUE."
-#~ msgstr ""
-#~ "如果为真, 则预编辑字符串将自动被当前候选词填充. 此选项仅在自动选择选项开启"
-#~ "时有效."
-
-#~ msgid "Always Show Lookup Table:"
-#~ msgstr "一直显示候选词表:"
-
-#~ msgid ""
-#~ "If true then the lookup table will always be shown when any candidate "
-#~ "phrase is available. Otherwise the lookup table will only be shown when "
-#~ "necessary.\n"
-#~ "If Auto Fill is false, then this option will be no effect, and always be "
-#~ "true."
-#~ msgstr ""
-#~ "如果为真,则当有候选词的时候总是显示候选词表. 否则候选词表将只在需要的时候"
-#~ "才被显示.\n"
-#~ "如果自动填充为假, 则该选项不起作用, 该值将永远为真."
-
-#~ msgid "Default Full Width Punct:"
-#~ msgstr "缺省全角标点:"
-
-#~ msgid "If true then full width punctuations will be inputed by default."
-#~ msgstr "如果为真, 则在缺省状态下输入全角标点."
-
-#~ msgid "Default Full Width Letter:"
-#~ msgstr "缺省全角字母:"
-
-#~ msgid "If true then full width letters will be inputed by default."
-#~ msgstr "如果为真, 则在缺省状态下输入全角字符."
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid "Invalid icon file."
-#~ msgstr "无效的图标文件."
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid "Invalid languages."
-#~ msgstr "无效的语言."
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "Invalid status prompt."
-#~ msgstr "无效的状态提示."
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Invalid multi wildcard chars."
-#~ msgstr "无效的多重扩展字符."
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "Invalid single wildcard chars."
-#~ msgstr "无效的单一扩展字符."
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Invalid commit keys."
-#~ msgstr "无效的提交键."
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Invalid select keys."
-#~ msgstr "无效的选择键."
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "Invalid page up keys."
-#~ msgstr "无效的向上翻页键."
+#~ msgid "English (British)"
+#~ msgstr "英语(不列颠)"
 
-#~ msgid "Invalid page down keys."
-#~ msgstr "无效的向下翻页键."
+#~ msgid "English (American)"
+#~ msgstr "英语(美国)"
 
-#~ msgid "Invalid max key length."
-#~ msgstr "无效的最大键长度."
+#~ msgid "English (Irish)"
+#~ msgstr "英语(爱尔兰)"
 
-#~ msgid "Failed to save table %s!"
-#~ msgstr "保存码表 %s 失败!"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "葡萄牙语(巴西)"
 
-#~ msgid "Failed to load any Config Modules!"
-#~ msgstr "无法调入任何配置模块!"
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "马来语(马来西亚)"
 
-#~ msgid "_Current Config Module:"
-#~ msgstr "当前配置模块(_C):"
+#~ msgid "Chinese (PRC)"
+#~ msgstr "中文(中国)"
 
-#~ msgid "<Not found>"
-#~ msgstr "<没有找到>"
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "中文(新加坡)"
 
-#~ msgid "Current Config Module has been changed to %s."
-#~ msgstr "当前配置模块已经变成 %s."
+#~ msgid "Uzbek (Latin)"
+#~ msgstr "乌兹别克语(拉丁)"
 
-#~ msgid "Start the SCIM Setup Utility."
-#~ msgstr "启动 SCIM 设置工具."
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "中文(台湾)"
 
-#~ msgid "Setup ..."
-#~ msgstr "设置 ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "中文(香港)"
 
-#~ msgid "Show status _box"
-#~ msgstr "显示状态栏(_B)"
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "西班牙语(传统)"
 
-#~ msgid ""
-#~ "If this option is checked, a float status box will be displayed to show "
-#~ "the status of current input module."
-#~ msgstr "如果选中这个选项, 将显示一个浮动的状态栏用以显示当前输入模块的状态."
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "西班牙语(墨西哥)"
 
-#~ msgid ""
-#~ "If this option is checked, a status box will be displayed on the lower "
-#~ "left corner of the client window to show the status of the current input "
-#~ "method.This option needs the support of the client application."
-#~ msgstr ""
-#~ "如果选中这个选项, 将在客户程序窗口的左下角显示一个浮动的状态栏, 用以显示当"
-#~ "前输入法的状态. 这个选项需要客户应用程序的支持."
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "虚拟键盘已启用"
index 979df96..4b84b60 100644 (file)
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ISF 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2011-01-01 22:41+0800\n"
 "Last-Translator: Haifeng Deng <haifeng.deng@samsung.com>\n"
 "Language-Team: scim@freedesktop.org\n"
@@ -13,705 +13,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "英文鍵盤"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr "英文輸入"
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "阿姆哈拉語"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "阿拉伯文"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "阿拉伯文(埃及)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "阿拉伯文(黎巴嫩)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "阿薩姆語"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "白俄羅斯語"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "孟加拉語"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "孟加拉語(印度)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "藏語"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "波斯尼亞語"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "威爾斯語"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr "迪韋西語"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "英文(澳洲)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "英文(加拿大)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "英文(英國)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "英文(愛爾蘭)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "英文(美國)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "西班牙文(墨西哥)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "波斯語"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "愛爾蘭語"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "古吉拉特語"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "希伯來文"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "北印度文"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "世界語"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "印尼語"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "æ\97¥æ\96\87"
+msgstr "æ\97¥æ\9c¬èª\9e"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "柬埔寨文"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "卡納達語"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "老撾語"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "馬其頓語"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "馬拉雅拉姆語"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "蒙古文"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "馬拉地語"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "馬來語"
+msgstr "Bahasa Malaysia"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "緬甸語"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "尼泊爾語"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr "挪威語(尼諾斯克)"
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "挪威語(博克馬尓)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "奧里雅語"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "旁遮普語"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "僧伽羅語"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "亞爾巴尼亞語"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "塞爾維亞語"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "瑞典語(芬蘭)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "塔米爾語"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "泰盧固語"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "泰文"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "維吾爾語"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "烏爾都語(巴基斯坦)"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "烏玆別克語"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "越南文"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "華隆語"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "依地語"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "中文"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr "簡體中文"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr "中文(香港)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr "繁體中文"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr "荷蘭語(比利時)"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr "英文(新西蘭)"
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr "英文(愛爾蘭)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr "英文(南非)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr "英文(牙買加)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr "英文(伯利茲)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr "英文(特立尼達)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr "英文(津巴布韋)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr "英文(菲律賓)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr "法文(比利時)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr "德文(瑞士)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr "法文(盧森堡)"
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr "法文(摩納哥)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "德文(瑞士)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr "英文(澳洲)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr "德文(盧森堡)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr "德文(列支敦士登)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr "意大利文(瑞士)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙文(巴西)"
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr "西班牙文(傳統)"
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr "西班牙文(墨西哥)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr "西班牙文(危地馬拉)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr "西班牙文(哥斯達黎加)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr "西班牙文(巴拿馬)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr "西班牙文(多米尼加共和國)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr "西班牙文(委內瑞拉)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr "西班牙文(哥倫比亞)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr "西班牙文(秘魯)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr "西班牙文(阿根廷)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr "西班牙文(厄瓜多爾)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr "西班牙文(智利)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr "西班牙文(烏拉圭)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr "西班牙文(巴拉圭)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr "西班牙文(玻利維亞)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr "西班牙文(薩爾瓦多)"
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr "西班牙文(洪都拉斯)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr "西班牙文(尼加拉瓜)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr "西班牙文(波多黎各)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr "南非語"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr "馬來文(馬來西亞)"
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr "馬來文(文萊)"
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "挪威語"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr "塞爾維亞語(西里爾)"
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr "烏茲別克語(拉丁)"
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr "中文(台灣)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "中文(香港)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr "中文(澳門)"
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr "中文(中華人民共和國)"
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr "中文(新加坡)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr "阿拉伯文(沙特阿拉伯)"
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr "阿拉伯文(伊拉克)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr "阿拉伯文(利比亞)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr "阿拉伯文(阿爾及利亞)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯文(摩洛哥)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr "阿拉伯文(突尼斯)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr "阿拉伯文(阿曼)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr "阿拉伯文(也門)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr "阿拉伯文(敘利亞)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr "阿拉伯文(約旦)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr "阿拉伯文(科威特)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr "阿拉伯文(阿聯酋)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr "阿拉伯文(巴林)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr "阿拉伯文(卡塔爾)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr "豪薩文"
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr "科薩語"
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr "約魯巴語"
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr "祖魯語"
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "其它語"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "未知"
 
@@ -751,10 +717,6 @@ msgstr "斯洛伐克語(標準鍵盤)"
 msgid "Spanish (CP 850)"
 msgstr "西班牙文(CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "西班牙文(拉丁美洲)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "英式英文"
@@ -812,11 +774,11 @@ msgstr "簡轉繁體"
 msgid "TC->SC"
 msgstr "繁轉簡體"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "泛用智慧型輸入法平台"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -826,7 +788,7 @@ msgstr ""
 "(C) 2002-2005 蘇哲 <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -834,7 +796,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -842,15 +804,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "開啟"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "選擇輸入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "設定輸入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s 已選擇"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "名稱"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "僅 %s 可用"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "已從硬體鍵盤偵測到輸入"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "輕觸以使用虛擬鍵盤"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1022,560 +1015,191 @@ msgid "The orientation of the tray."
 msgstr "狀態列的方位。"
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
 msgstr ""
 
-#~ msgid "Keyboards"
-#~ msgstr "英文鍵盤"
-
-#~ msgid "English/European"
-#~ msgstr "英文/歐洲語文"
-
-#~ msgid "RAW CODE"
-#~ msgstr "內碼輸入"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 蘇哲 <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "快捷鍵:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    切換地區編碼和 Unicode 編碼。\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    重設輸入法。\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "目前輸入法的模式狀態,滑鼠點選可切換模式。"
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "全域設定"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "調整所有介面模組的共通設定,包含 X11 介面、GTK+ IMModule、Qt IMModule 等"
-
-#~ msgid "_Trigger:"
-#~ msgstr "作用鍵(_T):"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "選擇輸入法的作用鍵"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用來 開啟/關閉 SCIM 輸入法的作用鍵,點壓該按鈕後可編輯。"
-
-#~ msgid "Turn _On:"
-#~ msgstr "開啟(_O)"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "選擇開啟 SCIM 按鍵"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來開啟 SCIM 輸入法,點壓該按鈕後可編輯。"
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "關閉 (_F)"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "選擇關閉 SCIM 按鍵"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來關閉 SCIM 輸入法,點壓該按鈕後可編輯。"
-
-#~ msgid "_Next input method:"
-#~ msgstr "下一種輸入法(_N):"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "選擇下一種輸入法按鍵"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用來切換至下一種輸入法的按鍵,按鈕上滑鼠點選可編輯。"
-
-#~ msgid "_Previous input method:"
-#~ msgstr "上一種輸入法(_P):"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "選擇上一種輸入法按鍵"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr "用來切換至上一種輸入法的按鍵,點壓按鈕後可編輯。"
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "顯示輸入法選單(_M):"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "選擇顯示輸入法選單按鍵"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來顯示輸入法選單的按鍵,點壓按鈕後可編輯。"
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "鍵盤排列(_K):"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr "您應適當挑選鍵盤排列方式,這樣輸入法才能正確運作。"
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "在輸入法客戶端視窗嵌入預先編輯字串(_E)"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "如果勾取這個選項,預先編輯字串將會直接顯示於輸入法客戶端,而非出現於獨立的"
-#~ "浮動視窗"
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "在所有的應用程式共享同樣的輸入法(_S)"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "如果啟用本選項,所有應用程式在一時間將只會有一個輸入法,否則個別的應用程式"
-#~ "可以使用不同的輸入法。"
-
-#~ msgid "Hotkeys"
-#~ msgstr "快速鍵"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr "你可在此開啟或關閉已安裝的輸入法,並設定快速鍵"
-
-#~ msgid "The installed input method services:"
-#~ msgstr "已安裝的輸入法服務:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "編輯快速鍵(_H)"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "編輯所選取輸入法關連的快速鍵"
-
-#~ msgid "Select _Filters"
-#~ msgstr "選定的轉換過濾器(_F)"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "選擇施加到輸入法的轉換過濾器"
-
-#~ msgid "_Expand"
-#~ msgstr "展開(_E)"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "展開所有語言目錄"
-
-#~ msgid "_Collapse"
-#~ msgstr "折疊(_C)"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "折疊所有語言目錄"
-
-#~ msgid "E_nable All"
-#~ msgstr "使用所有的輸入法(_E)"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "使用所有輸入法"
-
-#~ msgid "_Disable All"
-#~ msgstr "停用所有輸入法(_D)"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "停用所有輸入法"
-
-#~ msgid "Filters"
-#~ msgstr "轉換過濾器"
-
-#~ msgid "Languages"
-#~ msgstr "語文"
-
-#~ msgid "Description"
-#~ msgstr "描述"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "編輯 %s 的快速鍵"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "編輯 %s 的轉換過濾器"
-
-#~ msgid "Move _Up"
-#~ msgstr "上移(_U)"
-
-#~ msgid "Move _Down"
-#~ msgstr "下移(_D)"
-
-#~ msgid "GTK"
-#~ msgstr "GTK+"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "一個使用 GTK+-2.x 撰寫的操控面板背景程式。"
-
-#~ msgid "On demand"
-#~ msgstr "需要時"
-
-#~ msgid "Never"
-#~ msgstr "從不"
-
-#~ msgid "ToolBar"
-#~ msgstr "工具列"
-
-#~ msgid "_Show:"
-#~ msgstr "顯示(_S):"
-
-#~ msgid "Auto s_nap"
-#~ msgstr "自動靠邊(_N)"
-
-#~ msgid "Show _input method icon"
-#~ msgstr "顯示輸入法圖示(_I)"
-
-#~ msgid "Show inp_ut method name"
-#~ msgstr "顯示輸入法名稱(_U)"
-
-#~ msgid "Hide time_out:"
-#~ msgstr "逾時隱藏(_O):"
-
-#~ msgid "Show s_tick icon"
-#~ msgstr "顯示固定圖示(_T)"
-
-#~ msgid "Show m_enu icon"
-#~ msgstr "顯示選單圖示(_E)"
-
-#~ msgid "Show _help icon"
-#~ msgstr "顯示求助圖示(_H)"
-
-#~ msgid "Show _property label"
-#~ msgstr "顯示屬性名稱(_P)"
-
-#~ msgid "Input window"
-#~ msgstr "輸入視窗"
-
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "嵌入式選詞列表(_M)"
-
-#~ msgid "_Vertical lookup table"
-#~ msgstr "垂直式選詞列表(_V)"
-
-#~ msgid "Misc"
-#~ msgstr "其它"
-
-#~ msgid "Show tra_y icon"
-#~ msgstr "顯示系統列圖示(_Y)"
-
-#~ msgid "Stick _windows"
-#~ msgstr "固定視窗(_W)"
-
-#~ msgid "_Font:"
-#~ msgstr "字形(_F):"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "如果選取「永遠」選項,工具列將永遠顯示在螢幕上。如果選取「需要時」選項,則"
-#~ "只有當 SCIM 被啟用時才會顯示工具列。如果選取「從不」選項,則永遠不會顯示工"
-#~ "具列。"
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr "如果勾取這個選項,工具列將緊黏在螢幕邊緣。"
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "在經過一定時間後,工具列將被隱藏起來,該選項只在選取「永遠顯示」時才會作"
-#~ "用。當設定值為 0 時,將關閉此功能。"
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果勾取這個選項,輸入法圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果勾取這個選項,輸入法名稱將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,固定圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,選單圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,求助圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,輸入法屬性的名稱將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr "如果勾取這個選項,選詞列表將出現在輸入視窗中。"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr "如果勾取這個選項,選詞列表將垂直顯示。"
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr "如果勾取這個選項,系統圖示將顯示在桌面的工作列上。"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr "如果勾取這個選項,則輸入和選詞列表視窗將停留在它們的原本位置。"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr "該字形設定將套用於輸入和選詞列表視窗。"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Select Interface Font"
-#~ msgstr "選擇介面字形"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "介面(前端)"
-
-#~ msgid "IMEngine"
-#~ msgstr "輸入法引擎"
-
-#~ msgid "Panel"
-#~ msgstr "面板"
-
-#~ msgid "Extra"
-#~ msgstr "附加項目"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "SCIM 輸入法設定"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">泛用智慧型輸入法平台</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">圖形介面設定工具</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">版權所有 2002-2004, 蘇  哲 &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">%s 模組的設定。</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "是否關閉 SCIM 設定程式?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr "並非所有設定都可以立即生效。別忘了重新啟動 SCIM 來讓新的設定生效。"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "SCIM Setup"
-#~ msgstr "SCIM 設定"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr "以 GTK+ 撰寫的整合設定工具。"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "泛用智慧型輸入法平台的設定工具"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "SCIM Help"
-#~ msgstr "求助 SCIM"
+#~ msgid "English (British)"
+#~ msgstr "英文(英國)"
 
-#~ msgid "Smart Common Input Method"
-#~ msgstr "泛用智慧型輸入法平台"
+#~ msgid "English (American)"
+#~ msgstr "英文(美國)"
 
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "固定/釋開 輸入視窗和工具列。"
+#~ msgid "English (Irish)"
+#~ msgstr "英文(愛爾蘭)"
 
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "顯示關於 SCIM 和目前輸入法的精簡說明。"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "葡萄牙文(巴西)"
 
-#~ msgid "Show command menu."
-#~ msgstr "顯示æ\8c\87令é\81¸å\96®."
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "馬ä¾\86æ\96\87(馬ä¾\86西äº\9e)"
 
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(c) 2002-2005 蘇哲 <suzhe@tsinghua.org.cn>"
+#~ msgid "Chinese (PRC)"
+#~ msgstr "中文(中華人民共和國)"
 
-#~ msgid "Reload Configuration"
-#~ msgstr "重新載入設定值"
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "中文(新加坡)"
 
-#~ msgid "Stick Windows"
-#~ msgstr "固定視窗"
+#~ msgid "Uzbek (Latin)"
+#~ msgstr "烏茲別克語(拉丁)"
 
-#~ msgid "Hide Toolbar"
-#~ msgstr "隱藏工具列"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "中文(台灣)"
 
-#~ msgid "Help ..."
-#~ msgstr "求助 ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "中文(香港)"
 
-#~ msgid "Exit"
-#~ msgstr "離開"
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "西班牙文(傳統)"
 
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "西班牙文(墨西哥)"
 
-#~ msgid "En"
-#~ msgstr "è\8b±"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "è\99\9bæ\93¬é\8dµç\9b¤å·²å\95\9fç\94¨"
index c18add9..31fb8b8 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,704 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr ""
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr ""
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr ""
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr ""
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr ""
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr ""
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr ""
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr ""
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr ""
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr ""
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:886
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr ""
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr ""
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr ""
 
@@ -754,10 +721,6 @@ msgstr ""
 msgid "Spanish (CP 850)"
 msgstr ""
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr ""
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr ""
@@ -815,39 +778,70 @@ msgstr ""
 msgid "TC->SC"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "选择输入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "设置输入方法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
 msgstr ""
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
 msgstr ""
 
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "已选择%s"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "仅限 %s 可用"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "已从硬件键盘检测到输入"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "轻敲以使用虚拟键盘"
+
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
 msgstr ""
@@ -1016,115 +1010,154 @@ msgid "The orientation of the tray."
 msgstr ""
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
+msgstr ""
+
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
+msgstr ""
+
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
+msgstr ""
+
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
+msgstr ""
+
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
+msgstr ""
+
 #. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
+#: ism/demos/isf_layout_efl.cpp:260
 msgid "click to enter PASSWORD"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
+#: ism/demos/isf_demo_efl.cpp:171
 msgid "ISF Demo"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
+#: ism/demos/isf_entry_event_efl.cpp:149
 msgid "Entry Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
+#: ism/demos/isf_event_efl.cpp:231
 msgid "Label Event"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
+#: ism/demos/isf_event_efl.cpp:260
 msgid "Event"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
+#: ism/demos/isf_imcontrol_efl.cpp:291
 msgid "IM Control"
 msgstr ""
+
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "虚拟键盘已启用"
index fbefe62..8a121d9 100644 (file)
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 14:45+0900\n"
+"POT-Creation-Date: 2014-01-22 15:05+0900\n"
 "PO-Revision-Date: 2005-07-06 22:41+0800\n"
 "Last-Translator: Jim Huang <jserv@kaffe.org>\n"
 "Language-Team: scim@freedesktop.org\n"
@@ -14,705 +14,671 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ism/src/scim_compose_key.cpp:126 ism/src/scim_imengine.cpp:673
-#: ism/src/scim_panel_agent.cpp:348 ism/src/scim_panel_agent.cpp:4046
-#: ism/src/scim_utility.cpp:702
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1715
+#: ism/src/scim_compose_key.cpp:128 ism/src/scim_imengine.cpp:812
+#: ism/src/scim_panel_agent.cpp:385 ism/src/scim_panel_agent.cpp:4205
+#: ism/src/scim_utility.cpp:784
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1730
 msgid "English Keyboard"
 msgstr "英文鍵盤"
 
 #. return WideString ();
-#: ism/src/scim_compose_key.cpp:145
+#: ism/src/scim_compose_key.cpp:147
 msgid "English input service"
 msgstr "英文輸入"
 
-#: ism/src/scim_utility.cpp:703
+#: ism/src/scim_utility.cpp:785
 msgid "Amharic"
 msgstr "阿姆哈拉語"
 
-#: ism/src/scim_utility.cpp:704
+#: ism/src/scim_utility.cpp:786
 msgid "Arabic"
-msgstr "阿拉伯文"
+msgstr "عربي"
 
-#: ism/src/scim_utility.cpp:705 ism/src/scim_utility.cpp:894
+#: ism/src/scim_utility.cpp:787
 msgid "Arabic (Egypt)"
 msgstr "阿拉伯文(埃及)"
 
-#: ism/src/scim_utility.cpp:706 ism/src/scim_utility.cpp:903
+#: ism/src/scim_utility.cpp:788
 msgid "Arabic (Lebanon)"
 msgstr "阿拉伯文(黎巴嫩)"
 
-#: ism/src/scim_utility.cpp:707
+#: ism/src/scim_utility.cpp:789
 msgid "Assamese"
 msgstr "阿薩姆語"
 
-#: ism/src/scim_utility.cpp:708 ism/src/scim_utility.cpp:919
+#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:946
 msgid "Azerbaijani"
-msgstr "Azərbaycan"
+msgstr "Azərbaycanca"
 
-#: ism/src/scim_utility.cpp:709
+#: ism/src/scim_utility.cpp:791
 msgid "Belarusian"
 msgstr "白俄羅斯語"
 
-#: ism/src/scim_utility.cpp:710 ism/src/scim_utility.cpp:875
+#: ism/src/scim_utility.cpp:792
 msgid "Bulgarian"
 msgstr "Български"
 
-#: ism/src/scim_utility.cpp:711 ism/src/scim_utility.cpp:712
-#: ism/src/scim_utility.cpp:914
+#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:794
 msgid "Bengali"
-msgstr "孟加拉語"
+msgstr "বাংলা"
 
-#: ism/src/scim_utility.cpp:713
+#: ism/src/scim_utility.cpp:795
 msgid "Bengali (India)"
 msgstr "孟加拉語(印度)"
 
-#: ism/src/scim_utility.cpp:714
+#: ism/src/scim_utility.cpp:796
 msgid "Tibetan"
 msgstr "藏語"
 
-#: ism/src/scim_utility.cpp:715
+#: ism/src/scim_utility.cpp:797
 msgid "Bosnian"
-msgstr "波斯尼亞語"
+msgstr "Bosanski"
 
-#: ism/src/scim_utility.cpp:716 ism/src/scim_utility.cpp:854
+#: ism/src/scim_utility.cpp:798
 msgid "Catalan"
 msgstr "Català"
 
-#: ism/src/scim_utility.cpp:717 ism/src/scim_utility.cpp:864
-#: ism/src/scim_keyboard_layout_data.h:4596
+#: ism/src/scim_utility.cpp:799 ism/src/scim_keyboard_layout_data.h:4596
 msgid "Czech"
-msgstr "Čeština"
+msgstr "Český"
 
-#: ism/src/scim_utility.cpp:718 ism/src/scim_utility.cpp:924
+#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:948
 msgid "Welsh"
-msgstr "威爾斯語"
+msgstr "Cymraeg"
 
-#: ism/src/scim_utility.cpp:719 ism/src/scim_utility.cpp:855
-#: ism/src/scim_keyboard_layout_data.h:4598
+#: ism/src/scim_utility.cpp:801 ism/src/scim_keyboard_layout_data.h:4598
 msgid "Danish"
 msgstr "Dansk"
 
-#: ism/src/scim_utility.cpp:720 ism/src/scim_utility.cpp:825
-#: ism/src/scim_keyboard_layout_data.h:4606
+#: ism/src/scim_utility.cpp:802 ism/src/scim_keyboard_layout_data.h:4606
 msgid "German"
 msgstr "Deutsch"
 
-#: ism/src/scim_utility.cpp:721
+#: ism/src/scim_utility.cpp:803
 msgid "Divehi"
 msgstr "迪韋西語"
 
-#: ism/src/scim_utility.cpp:722 ism/src/scim_utility.cpp:874
-#: ism/src/scim_keyboard_layout_data.h:4609
+#: ism/src/scim_utility.cpp:804 ism/src/scim_keyboard_layout_data.h:4609
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: ism/src/scim_utility.cpp:723
+#: ism/src/scim_utility.cpp:805
 msgid "English"
 msgstr "English"
 
-#: ism/src/scim_utility.cpp:724 ism/src/scim_utility.cpp:809
+#: ism/src/scim_utility.cpp:806
 msgid "English (Australian)"
 msgstr "英文(澳洲)"
 
-#: ism/src/scim_utility.cpp:725 ism/src/scim_utility.cpp:810
+#: ism/src/scim_utility.cpp:807
 msgid "English (Canadian)"
 msgstr "英文(加拿大)"
 
-#: ism/src/scim_utility.cpp:726
-msgid "English (British)"
-msgstr "英文(英國)"
+#: ism/src/scim_utility.cpp:808
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ism/src/scim_utility.cpp:727
+#: ism/src/scim_utility.cpp:809
 msgid "English (Ireland)"
 msgstr "英文(愛爾蘭)"
 
-#: ism/src/scim_utility.cpp:728
-msgid "English (American)"
-msgstr "英文(美國)"
+#: ism/src/scim_utility.cpp:810
+msgid "English (United States)"
+msgstr "English (United States)"
+
+#: ism/src/scim_utility.cpp:811
+msgid "Esperanto"
+msgstr ""
 
-#: ism/src/scim_utility.cpp:729 ism/src/scim_utility.cpp:730
+#: ism/src/scim_utility.cpp:812 ism/src/scim_utility.cpp:813
 #: ism/src/scim_keyboard_layout_data.h:4622
 msgid "Spanish"
 msgstr "Español"
 
-#: ism/src/scim_utility.cpp:731
+#: ism/src/scim_utility.cpp:814
 msgid "Spanish (Mexico)"
-msgstr "西班牙文(墨西哥)"
+msgstr "Español (México)"
+
+#: ism/src/scim_utility.cpp:815
+msgid "Spanish (United States)"
+msgstr "Español (Estados Unidos)"
 
-#: ism/src/scim_utility.cpp:732 ism/src/scim_utility.cpp:871
-#: ism/src/scim_keyboard_layout_data.h:4601
+#: ism/src/scim_utility.cpp:816 ism/src/scim_keyboard_layout_data.h:4601
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ism/src/scim_utility.cpp:733 ism/src/scim_utility.cpp:853
+#: ism/src/scim_utility.cpp:817
 msgid "Basque"
 msgstr "Euskara"
 
-#: ism/src/scim_utility.cpp:734
+#: ism/src/scim_utility.cpp:818
 msgid "Persian"
-msgstr "波斯語"
+msgstr "فارسی"
 
-#: ism/src/scim_utility.cpp:735 ism/src/scim_utility.cpp:858
-#: ism/src/scim_keyboard_layout_data.h:4602
+#: ism/src/scim_utility.cpp:819 ism/src/scim_keyboard_layout_data.h:4602
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ism/src/scim_utility.cpp:736 ism/src/scim_utility.cpp:819
-#: ism/src/scim_keyboard_layout_data.h:4603
+#: ism/src/scim_utility.cpp:820 ism/src/scim_keyboard_layout_data.h:4603
 msgid "French"
 msgstr "Français"
 
-#: ism/src/scim_utility.cpp:737 ism/src/scim_utility.cpp:922
+#: ism/src/scim_utility.cpp:821
 msgid "Irish"
-msgstr "愛爾蘭語"
+msgstr "Gaeilge"
 
-#: ism/src/scim_utility.cpp:738 ism/src/scim_utility.cpp:920
+#: ism/src/scim_utility.cpp:822
 msgid "Galician"
 msgstr "Galego"
 
-#: ism/src/scim_utility.cpp:739 ism/src/scim_utility.cpp:915
+#: ism/src/scim_utility.cpp:823
 msgid "Gujarati"
-msgstr "古吉拉特語"
+msgstr "ગુજરાતી"
 
-#: ism/src/scim_utility.cpp:740 ism/src/scim_utility.cpp:749
-#: ism/src/scim_utility.cpp:891
+#: ism/src/scim_utility.cpp:824 ism/src/scim_utility.cpp:833
 msgid "Hebrew"
-msgstr "希伯來文"
+msgstr "עברית"
 
-#: ism/src/scim_utility.cpp:741 ism/src/scim_utility.cpp:910
+#: ism/src/scim_utility.cpp:825
 msgid "Hindi"
-msgstr "北印度文"
+msgstr "हिन्दी"
 
-#: ism/src/scim_utility.cpp:742 ism/src/scim_keyboard_layout_data.h:4595
+#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4595
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ism/src/scim_utility.cpp:743 ism/src/scim_utility.cpp:865
-#: ism/src/scim_keyboard_layout_data.h:4610
+#: ism/src/scim_utility.cpp:827 ism/src/scim_keyboard_layout_data.h:4610
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ism/src/scim_utility.cpp:744
+#: ism/src/scim_utility.cpp:828
 msgid "Armenian"
 msgstr "Հայերեն"
 
-#: ism/src/scim_utility.cpp:745
+#: ism/src/scim_utility.cpp:829
 msgid "Interlingua"
 msgstr "世界語"
 
-#: ism/src/scim_utility.cpp:746
+#: ism/src/scim_utility.cpp:830
 msgid "Indonesian"
-msgstr "印尼語"
+msgstr "Bahasa Indonesia"
 
-#: ism/src/scim_utility.cpp:747 ism/src/scim_utility.cpp:857
-#: ism/src/scim_keyboard_layout_data.h:4628
+#: ism/src/scim_utility.cpp:831 ism/src/scim_keyboard_layout_data.h:4628
 msgid "Icelandic"
 msgstr "íslenska"
 
-#: ism/src/scim_utility.cpp:748 ism/src/scim_utility.cpp:830
-#: ism/src/scim_keyboard_layout_data.h:4611
+#: ism/src/scim_utility.cpp:832 ism/src/scim_keyboard_layout_data.h:4611
 msgid "Italian"
 msgstr "Italiano"
 
-#: ism/src/scim_utility.cpp:750 ism/src/scim_utility.cpp:883
-#: ism/src/scim_keyboard_layout_data.h:4612
+#: ism/src/scim_utility.cpp:834 ism/src/scim_keyboard_layout_data.h:4612
 msgid "Japanese"
-msgstr "æ\97¥æ\96\87"
+msgstr "æ\97¥æ\9c¬èª\9e"
 
-#: ism/src/scim_utility.cpp:751 ism/src/scim_utility.cpp:918
+#: ism/src/scim_utility.cpp:835
 msgid "Georgian"
 msgstr "ქართული"
 
-#: ism/src/scim_utility.cpp:752 ism/src/scim_utility.cpp:876
+#: ism/src/scim_utility.cpp:836
 msgid "Kazakh"
 msgstr "Қазақ"
 
-#: ism/src/scim_utility.cpp:753
+#: ism/src/scim_utility.cpp:837
 msgid "Cambodian"
 msgstr "柬埔寨文"
 
-#: ism/src/scim_utility.cpp:754
+#: ism/src/scim_utility.cpp:838
 msgid "Kannada"
-msgstr "卡納達語"
+msgstr "ಕನ್ನಡ"
 
-#: ism/src/scim_utility.cpp:755 ism/src/scim_utility.cpp:884
+#: ism/src/scim_utility.cpp:839
 msgid "Korean"
 msgstr "한국어"
 
-#: ism/src/scim_utility.cpp:756
+#: ism/src/scim_utility.cpp:840
 msgid "Laothian"
-msgstr "老撾語"
+msgstr "ລາວ"
 
-#: ism/src/scim_utility.cpp:757 ism/src/scim_utility.cpp:873
-#: ism/src/scim_keyboard_layout_data.h:4629
+#: ism/src/scim_utility.cpp:841 ism/src/scim_keyboard_layout_data.h:4629
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: ism/src/scim_utility.cpp:758 ism/src/scim_utility.cpp:872
+#: ism/src/scim_utility.cpp:842
 msgid "Latvian"
 msgstr "Latviešu"
 
-#: ism/src/scim_utility.cpp:759 ism/src/scim_utility.cpp:877
+#: ism/src/scim_utility.cpp:843
 msgid "Macedonian"
-msgstr "馬其頓語"
+msgstr "Македонски"
 
-#: ism/src/scim_utility.cpp:760 ism/src/scim_utility.cpp:916
+#: ism/src/scim_utility.cpp:844
 msgid "Malayalam"
-msgstr "馬拉雅拉姆語"
+msgstr "മലയാളം"
 
-#: ism/src/scim_utility.cpp:761
+#: ism/src/scim_utility.cpp:845
 msgid "Mongolian"
-msgstr "蒙古文"
+msgstr "Монгол"
 
-#: ism/src/scim_utility.cpp:762 ism/src/scim_utility.cpp:912
+#: ism/src/scim_utility.cpp:846
 msgid "Marathi"
-msgstr "馬拉地語"
+msgstr "मराठी"
 
-#: ism/src/scim_utility.cpp:763
+#: ism/src/scim_utility.cpp:847
 msgid "Malay"
-msgstr "馬來語"
+msgstr "馬ä¾\86西äº\9eèª\9e"
 
-#: ism/src/scim_utility.cpp:764
+#: ism/src/scim_utility.cpp:848
 msgid "Burmese"
-msgstr "緬甸語"
+msgstr "မြန်မာဘာသာ"
 
-#: ism/src/scim_utility.cpp:765
+#: ism/src/scim_utility.cpp:849
 msgid "Nepali"
 msgstr "尼泊爾語"
 
-#: ism/src/scim_utility.cpp:766 ism/src/scim_utility.cpp:805
-#: ism/src/scim_keyboard_layout_data.h:4599
+#: ism/src/scim_utility.cpp:850 ism/src/scim_keyboard_layout_data.h:4599
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ism/src/scim_utility.cpp:767
+#: ism/src/scim_utility.cpp:851
 msgid "Norwegian (Nynorsk)"
 msgstr "挪威語(尼諾斯克)"
 
-#: ism/src/scim_utility.cpp:768
+#: ism/src/scim_utility.cpp:852
 msgid "Norwegian (Bokmal)"
-msgstr "挪威語(博克馬尓)"
+msgstr "Norsk (Bokmål)"
 
-#: ism/src/scim_utility.cpp:769
+#: ism/src/scim_utility.cpp:853
 msgid "Oriya"
 msgstr "奧里雅語"
 
-#: ism/src/scim_utility.cpp:770 ism/src/scim_utility.cpp:917
+#: ism/src/scim_utility.cpp:854
 msgid "Punjabi"
-msgstr "旁遮普語"
+msgstr "ਪੰਜਾਬੀ"
 
-#: ism/src/scim_utility.cpp:771 ism/src/scim_utility.cpp:866
-#: ism/src/scim_keyboard_layout_data.h:4614
+#: ism/src/scim_utility.cpp:855 ism/src/scim_keyboard_layout_data.h:4614
 msgid "Polish"
 msgstr "Polski"
 
-#: ism/src/scim_utility.cpp:772 ism/src/scim_utility.cpp:774
-#: ism/src/scim_utility.cpp:833 ism/src/scim_keyboard_layout_data.h:4615
+#: ism/src/scim_utility.cpp:856 ism/src/scim_utility.cpp:858
+#: ism/src/scim_keyboard_layout_data.h:4615
 msgid "Portuguese"
 msgstr "Português"
 
-#: ism/src/scim_utility.cpp:773 ism/src/scim_keyboard_layout_data.h:4616
+#: ism/src/scim_utility.cpp:857 ism/src/scim_keyboard_layout_data.h:4616
 msgid "Portuguese (Brazil)"
 msgstr "Português (Brasil)"
 
-#: ism/src/scim_utility.cpp:775 ism/src/scim_utility.cpp:867
+#: ism/src/scim_utility.cpp:859
 msgid "Romanian"
 msgstr "Română"
 
-#: ism/src/scim_utility.cpp:776 ism/src/scim_utility.cpp:878
-#: ism/src/scim_keyboard_layout_data.h:4618
+#: ism/src/scim_utility.cpp:860 ism/src/scim_keyboard_layout_data.h:4618
 msgid "Russian"
 msgstr "Русский"
 
-#: ism/src/scim_utility.cpp:777 ism/src/scim_utility.cpp:923
+#: ism/src/scim_utility.cpp:861 ism/src/scim_utility.cpp:862
+msgid "Sindhi"
+msgstr ""
+
+#: ism/src/scim_utility.cpp:863
 msgid "Sinhala"
 msgstr "僧伽羅語"
 
-#: ism/src/scim_utility.cpp:778 ism/src/scim_utility.cpp:869
-#: ism/src/scim_keyboard_layout_data.h:4619
+#: ism/src/scim_utility.cpp:864 ism/src/scim_keyboard_layout_data.h:4619
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ism/src/scim_utility.cpp:779 ism/src/scim_utility.cpp:870
-#: ism/src/scim_keyboard_layout_data.h:4621
+#: ism/src/scim_utility.cpp:865 ism/src/scim_keyboard_layout_data.h:4621
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: ism/src/scim_utility.cpp:780
+#: ism/src/scim_utility.cpp:866
 msgid "Albanian"
-msgstr "亞爾巴尼亞語"
+msgstr "shqip"
 
-#: ism/src/scim_utility.cpp:781 ism/src/scim_utility.cpp:782
-#: ism/src/scim_utility.cpp:783
+#: ism/src/scim_utility.cpp:867 ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:869
 msgid "Serbian"
-msgstr "塞爾維亞語"
+msgstr "Srpski"
 
-#: ism/src/scim_utility.cpp:784 ism/src/scim_utility.cpp:786
-#: ism/src/scim_utility.cpp:862 ism/src/scim_keyboard_layout_data.h:4625
+#: ism/src/scim_utility.cpp:870 ism/src/scim_utility.cpp:872
+#: ism/src/scim_keyboard_layout_data.h:4625
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ism/src/scim_utility.cpp:785 ism/src/scim_utility.cpp:863
+#: ism/src/scim_utility.cpp:871
 msgid "Swedish (Finland)"
 msgstr "瑞典語(芬蘭)"
 
-#: ism/src/scim_utility.cpp:787 ism/src/scim_utility.cpp:913
+#: ism/src/scim_utility.cpp:873
 msgid "Tamil"
-msgstr "塔米爾語"
+msgstr "தமிழ்"
 
-#: ism/src/scim_utility.cpp:788 ism/src/scim_utility.cpp:911
+#: ism/src/scim_utility.cpp:874
 msgid "Telugu"
-msgstr "泰盧固語"
+msgstr "తెలుగు"
 
-#: ism/src/scim_utility.cpp:789 ism/src/scim_utility.cpp:890
+#: ism/src/scim_utility.cpp:875
 msgid "Thai"
-msgstr "泰文"
+msgstr "ภาษาไทย"
 
-#: ism/src/scim_utility.cpp:790 ism/src/scim_utility.cpp:881
-#: ism/src/scim_keyboard_layout_data.h:4626
+#: ism/src/scim_utility.cpp:876 ism/src/scim_keyboard_layout_data.h:4626
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ism/src/scim_utility.cpp:791
+#: ism/src/scim_utility.cpp:877
 msgid "Uighur"
 msgstr "維吾爾語"
 
-#: ism/src/scim_utility.cpp:792 ism/src/scim_utility.cpp:880
-#: ism/src/scim_keyboard_layout_data.h:4630
+#: ism/src/scim_utility.cpp:878 ism/src/scim_keyboard_layout_data.h:4630
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ism/src/scim_utility.cpp:793 ism/src/scim_utility.cpp:908
+#: ism/src/scim_utility.cpp:879
 msgid "Urdu"
-msgstr "烏爾都語(巴基斯坦)"
+msgstr "اردو"
 
-#: ism/src/scim_utility.cpp:794
+#: ism/src/scim_utility.cpp:880
 msgid "Uzbek"
-msgstr "烏玆別克語"
+msgstr "o'zbek tili"
 
-#: ism/src/scim_utility.cpp:795 ism/src/scim_utility.cpp:909
+#: ism/src/scim_utility.cpp:881
 msgid "Vietnamese"
-msgstr "越南文"
+msgstr "Tiếng Việt"
 
-#: ism/src/scim_utility.cpp:796
+#: ism/src/scim_utility.cpp:882
 msgid "Walloon"
 msgstr "華隆語"
 
-#: ism/src/scim_utility.cpp:797 ism/src/scim_utility.cpp:798
+#: ism/src/scim_utility.cpp:883 ism/src/scim_utility.cpp:884
 msgid "Yiddish"
 msgstr "依地語"
 
-#: ism/src/scim_utility.cpp:799
+#: ism/src/scim_utility.cpp:885
 msgid "Chinese"
 msgstr "中文"
 
-#: ism/src/scim_utility.cpp:800 ism/src/scim_utility.cpp:802
+#: ism/src/scim_utility.cpp:886 ism/src/scim_utility.cpp:888
 msgid "Chinese (Simplified)"
 msgstr "簡體中文"
 
-#: ism/src/scim_utility.cpp:801
+#: ism/src/scim_utility.cpp:887
 msgid "Chinese (Hongkong)"
 msgstr "中文(香港)"
 
-#: ism/src/scim_utility.cpp:803
+#: ism/src/scim_utility.cpp:889
 msgid "Chinese (Traditional)"
 msgstr "繁體中文"
 
-#: ism/src/scim_utility.cpp:806
+#: ism/src/scim_utility.cpp:891
 msgid "Dutch (Belgian)"
 msgstr "荷蘭語(比利時)"
 
-#: ism/src/scim_utility.cpp:807
-msgid "English (United States)"
-msgstr "English (United States)"
-
-#: ism/src/scim_utility.cpp:808
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
-
-#: ism/src/scim_utility.cpp:811
+#: ism/src/scim_utility.cpp:892
 msgid "English (New Zealand)"
 msgstr "英文(新西蘭)"
 
-#: ism/src/scim_utility.cpp:812
-msgid "English (Irish)"
-msgstr "英文(愛爾蘭)"
-
-#: ism/src/scim_utility.cpp:813
+#: ism/src/scim_utility.cpp:893
 msgid "English (South Africa)"
 msgstr "英文(南非)"
 
-#: ism/src/scim_utility.cpp:814
+#: ism/src/scim_utility.cpp:894
 msgid "English (Jamaica)"
 msgstr "英文(牙買加)"
 
-#: ism/src/scim_utility.cpp:815
+#: ism/src/scim_utility.cpp:895
 msgid "English (Belize)"
 msgstr "英文(伯利茲)"
 
-#: ism/src/scim_utility.cpp:816
+#: ism/src/scim_utility.cpp:896
 msgid "English (Trinidad)"
 msgstr "英文(特立尼達)"
 
-#: ism/src/scim_utility.cpp:817
+#: ism/src/scim_utility.cpp:897
 msgid "English (Zimbabwe)"
 msgstr "英文(津巴布韋)"
 
-#: ism/src/scim_utility.cpp:818
+#: ism/src/scim_utility.cpp:898
 msgid "English (Philippines)"
 msgstr "英文(菲律賓)"
 
-#: ism/src/scim_utility.cpp:820
+#: ism/src/scim_utility.cpp:899
 msgid "French (Belgian)"
 msgstr "法文(比利時)"
 
-#: ism/src/scim_utility.cpp:821 ism/src/scim_keyboard_layout_data.h:4604
+#: ism/src/scim_utility.cpp:900 ism/src/scim_keyboard_layout_data.h:4604
 msgid "French (Canadian)"
-msgstr "Français (Canadian)"
+msgstr "Français (Canada)"
 
-#: ism/src/scim_utility.cpp:822
+#: ism/src/scim_utility.cpp:901
 msgid "French (Swiss)"
 msgstr "德文(瑞士)"
 
-#: ism/src/scim_utility.cpp:823
+#: ism/src/scim_utility.cpp:902
 msgid "French (Luxembourg)"
 msgstr "法文(盧森堡)"
 
-#: ism/src/scim_utility.cpp:824
+#: ism/src/scim_utility.cpp:903
 msgid "French (Monaco)"
 msgstr "法文(摩納哥)"
 
-#: ism/src/scim_utility.cpp:826 ism/src/scim_keyboard_layout_data.h:4608
+#: ism/src/scim_utility.cpp:904 ism/src/scim_keyboard_layout_data.h:4608
 msgid "German (Swiss)"
 msgstr "德文(瑞士)"
 
-#: ism/src/scim_utility.cpp:827
+#: ism/src/scim_utility.cpp:905
 msgid "German (Austrian)"
 msgstr "英文(澳洲)"
 
-#: ism/src/scim_utility.cpp:828
+#: ism/src/scim_utility.cpp:906
 msgid "German (Luxembourg)"
 msgstr "德文(盧森堡)"
 
-#: ism/src/scim_utility.cpp:829
+#: ism/src/scim_utility.cpp:907
 msgid "German (Liechtenstein)"
 msgstr "德文(列支敦士登)"
 
-#: ism/src/scim_utility.cpp:831
+#: ism/src/scim_utility.cpp:908
 msgid "Italian (Swiss)"
 msgstr "意大利文(瑞士)"
 
-#: ism/src/scim_utility.cpp:832
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙文(巴西)"
-
-#: ism/src/scim_utility.cpp:834
-msgid "Spanish (Traditional Sort)"
-msgstr "西班牙文(傳統)"
-
-#: ism/src/scim_utility.cpp:835
-msgid "Spanish (Mexican)"
-msgstr "西班牙文(墨西哥)"
-
-#: ism/src/scim_utility.cpp:836
+#: ism/src/scim_utility.cpp:909
 msgid "Spanish (Guatemala)"
 msgstr "西班牙文(危地馬拉)"
 
-#: ism/src/scim_utility.cpp:837
+#: ism/src/scim_utility.cpp:910
 msgid "Spanish (Costa Rica)"
 msgstr "西班牙文(哥斯達黎加)"
 
-#: ism/src/scim_utility.cpp:838
+#: ism/src/scim_utility.cpp:911
 msgid "Spanish (Panama)"
 msgstr "西班牙文(巴拿馬)"
 
-#: ism/src/scim_utility.cpp:839
+#: ism/src/scim_utility.cpp:912
 msgid "Spanish (Dominican Republic)"
 msgstr "西班牙文(多米尼加共和國)"
 
-#: ism/src/scim_utility.cpp:840
+#: ism/src/scim_utility.cpp:913
 msgid "Spanish (Venezuela)"
 msgstr "西班牙文(委內瑞拉)"
 
-#: ism/src/scim_utility.cpp:841
+#: ism/src/scim_utility.cpp:914
 msgid "Spanish (Colombia)"
 msgstr "西班牙文(哥倫比亞)"
 
-#: ism/src/scim_utility.cpp:842
+#: ism/src/scim_utility.cpp:915
 msgid "Spanish (Peru)"
 msgstr "西班牙文(秘魯)"
 
-#: ism/src/scim_utility.cpp:843
+#: ism/src/scim_utility.cpp:916
 msgid "Spanish (Argentina)"
 msgstr "西班牙文(阿根廷)"
 
-#: ism/src/scim_utility.cpp:844
+#: ism/src/scim_utility.cpp:917
 msgid "Spanish (Ecuador)"
 msgstr "西班牙文(厄瓜多爾)"
 
-#: ism/src/scim_utility.cpp:845
+#: ism/src/scim_utility.cpp:918
 msgid "Spanish (Chile)"
 msgstr "西班牙文(智利)"
 
-#: ism/src/scim_utility.cpp:846
+#: ism/src/scim_utility.cpp:919
 msgid "Spanish (Uruguay)"
 msgstr "西班牙文(烏拉圭)"
 
-#: ism/src/scim_utility.cpp:847
+#: ism/src/scim_utility.cpp:920
 msgid "Spanish (Paraguay)"
 msgstr "西班牙文(巴拉圭)"
 
-#: ism/src/scim_utility.cpp:848
+#: ism/src/scim_utility.cpp:921
 msgid "Spanish (Bolivia)"
 msgstr "西班牙文(玻利維亞)"
 
-#: ism/src/scim_utility.cpp:849
+#: ism/src/scim_utility.cpp:922
 msgid "Spanish (El Salvador)"
 msgstr "西班牙文(薩爾瓦多)"
 
-#: ism/src/scim_utility.cpp:850
+#: ism/src/scim_utility.cpp:923
 msgid "Spanish (Honduras)"
 msgstr "西班牙文(洪都拉斯)"
 
-#: ism/src/scim_utility.cpp:851
+#: ism/src/scim_utility.cpp:924
 msgid "Spanish (Nicaragua)"
 msgstr "西班牙文(尼加拉瓜)"
 
-#: ism/src/scim_utility.cpp:852
+#: ism/src/scim_utility.cpp:925
 msgid "Spanish (Puerto Rico)"
 msgstr "西班牙文(波多黎各)"
 
-#: ism/src/scim_utility.cpp:856
+#: ism/src/scim_utility.cpp:926 ism/src/scim_utility.cpp:955
 msgid "Afrikaans"
-msgstr "南非語"
+msgstr "Afrikaans"
 
-#: ism/src/scim_utility.cpp:859
-msgid "Malay (Malaysia)"
-msgstr "馬來文(馬來西亞)"
-
-#: ism/src/scim_utility.cpp:860
+#: ism/src/scim_utility.cpp:927
 msgid "Malay (Brunei Darussalam)"
 msgstr "馬來文(文萊)"
 
-#: ism/src/scim_utility.cpp:861 ism/src/scim_keyboard_layout_data.h:4613
+#: ism/src/scim_utility.cpp:928 ism/src/scim_keyboard_layout_data.h:4613
 msgid "Norwegian"
-msgstr "挪威語"
+msgstr "Norsk"
 
-#: ism/src/scim_utility.cpp:868
+#: ism/src/scim_utility.cpp:929
 msgid "Serbian (Latin)"
-msgstr "Srpski (Latin)"
+msgstr "Srpski (latinica)"
 
-#: ism/src/scim_utility.cpp:879
+#: ism/src/scim_utility.cpp:930
 msgid "Serbian (Cyrillic)"
 msgstr "塞爾維亞語(西里爾)"
 
-#: ism/src/scim_utility.cpp:882
-msgid "Uzbek (Latin)"
-msgstr "烏茲別克語(拉丁)"
-
-#: ism/src/scim_utility.cpp:885
-msgid "Chinese (Taiwan)"
-msgstr "中文(台灣)"
-
-#: ism/src/scim_utility.cpp:886
-#, fuzzy
-msgid "Chinese (Hong Kong)"
-msgstr "中文(香港)"
-
-#: ism/src/scim_utility.cpp:887
+#: ism/src/scim_utility.cpp:931
 msgid "Chinese (Macau)"
 msgstr "中文(澳門)"
 
-#: ism/src/scim_utility.cpp:888
-msgid "Chinese (PRC)"
-msgstr "中文(中華人民共和國)"
-
-#: ism/src/scim_utility.cpp:889
-msgid "Chinese (Singapore)"
-msgstr "中文(新加坡)"
-
-#: ism/src/scim_utility.cpp:892
+#: ism/src/scim_utility.cpp:932
 msgid "Arabic (Saudi Arabia)"
 msgstr "阿拉伯文(沙特阿拉伯)"
 
-#: ism/src/scim_utility.cpp:893
+#: ism/src/scim_utility.cpp:933
 msgid "Arabic (Iraq)"
 msgstr "阿拉伯文(伊拉克)"
 
-#: ism/src/scim_utility.cpp:895
+#: ism/src/scim_utility.cpp:934
 msgid "Arabic (Libya)"
 msgstr "阿拉伯文(利比亞)"
 
-#: ism/src/scim_utility.cpp:896
+#: ism/src/scim_utility.cpp:935
 msgid "Arabic (Algeria)"
 msgstr "阿拉伯文(阿爾及利亞)"
 
-#: ism/src/scim_utility.cpp:897
+#: ism/src/scim_utility.cpp:936
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯文(摩洛哥)"
 
-#: ism/src/scim_utility.cpp:898
+#: ism/src/scim_utility.cpp:937
 msgid "Arabic (Tunisia)"
 msgstr "阿拉伯文(突尼斯)"
 
-#: ism/src/scim_utility.cpp:899
+#: ism/src/scim_utility.cpp:938
 msgid "Arabic (Oman)"
 msgstr "阿拉伯文(阿曼)"
 
-#: ism/src/scim_utility.cpp:900
+#: ism/src/scim_utility.cpp:939
 msgid "Arabic (Yemen)"
 msgstr "阿拉伯文(也門)"
 
-#: ism/src/scim_utility.cpp:901
+#: ism/src/scim_utility.cpp:940
 msgid "Arabic (Syria)"
 msgstr "阿拉伯文(敘利亞)"
 
-#: ism/src/scim_utility.cpp:902
+#: ism/src/scim_utility.cpp:941
 msgid "Arabic (Jordan)"
 msgstr "阿拉伯文(約旦)"
 
-#: ism/src/scim_utility.cpp:904
+#: ism/src/scim_utility.cpp:942
 msgid "Arabic (Kuwait)"
 msgstr "阿拉伯文(科威特)"
 
-#: ism/src/scim_utility.cpp:905
+#: ism/src/scim_utility.cpp:943
 msgid "Arabic (UAE)"
 msgstr "阿拉伯文(阿聯酋)"
 
-#: ism/src/scim_utility.cpp:906
+#: ism/src/scim_utility.cpp:944
 msgid "Arabic (Bahrain)"
 msgstr "阿拉伯文(巴林)"
 
-#: ism/src/scim_utility.cpp:907
+#: ism/src/scim_utility.cpp:945
 msgid "Arabic (Qatar)"
 msgstr "阿拉伯文(卡塔爾)"
 
-#: ism/src/scim_utility.cpp:921
+#: ism/src/scim_utility.cpp:947
 msgid "Hausa"
 msgstr "豪薩文"
 
-#: ism/src/scim_utility.cpp:925
+#: ism/src/scim_utility.cpp:949
 msgid "Xhosa"
 msgstr "科薩語"
 
-#: ism/src/scim_utility.cpp:926
+#: ism/src/scim_utility.cpp:950
 msgid "Yoruba"
 msgstr "約魯巴語"
 
-#: ism/src/scim_utility.cpp:927
+#: ism/src/scim_utility.cpp:951
 msgid "Zulu"
 msgstr "祖魯語"
 
-#: ism/src/scim_utility.cpp:1025
+#: ism/src/scim_utility.cpp:952
+msgid "Hinglish"
+msgstr "Hinglish"
+
+#: ism/src/scim_utility.cpp:953
+msgid "Sundanese"
+msgstr "Basa Sunda"
+
+#: ism/src/scim_utility.cpp:954
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ism/src/scim_utility.cpp:956
+msgid "Javanese"
+msgstr "Basa Jawa"
+
+#: ism/src/scim_utility.cpp:957
+msgid "Khmer"
+msgstr "ភាសាខ្មែរ"
+
+#: ism/src/scim_utility.cpp:958 ism/src/scim_keyboard_layout_data.h:4624
+msgid "Spanish (Latin America)"
+msgstr "Español (América Latina)"
+
+#: ism/src/scim_utility.cpp:1056
 msgid "Other"
 msgstr "其它語"
 
 #: ism/src/scim_keyboard_layout_data.h:4592
-#: ism/modules/imengine/scim_socket_imengine.cpp:409
-#: ism/modules/imengine/scim_socket_imengine.cpp:466
-#: ism/modules/imengine/scim_socket_imengine.cpp:496
-#: ism/modules/imengine/scim_socket_imengine.cpp:526
+#: ism/modules/imengine/scim_socket_imengine.cpp:418
+#: ism/modules/imengine/scim_socket_imengine.cpp:477
+#: ism/modules/imengine/scim_socket_imengine.cpp:507
+#: ism/modules/imengine/scim_socket_imengine.cpp:537
 msgid "Unknown"
 msgstr "未知"
 
@@ -752,10 +718,6 @@ msgstr "斯洛伐克語(標準鍵盤)"
 msgid "Spanish (CP 850)"
 msgstr "西班牙文(CP 850)"
 
-#: ism/src/scim_keyboard_layout_data.h:4624
-msgid "Spanish (Latin America)"
-msgstr "西班牙文(拉丁美洲)"
-
 #: ism/src/scim_keyboard_layout_data.h:4627
 msgid "English (UK)"
 msgstr "英式英文"
@@ -813,11 +775,11 @@ msgstr "簡轉繁體"
 msgid "TC->SC"
 msgstr "繁轉簡體"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1665
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1680
 msgid "Smart Common Input Method platform "
 msgstr "泛用智慧型輸入法平台"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1667
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1682
 msgid ""
 "\n"
 "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n"
@@ -827,7 +789,7 @@ msgstr ""
 "(C) 2002-2005 蘇哲 <suzhe@tsinghua.org.cn>\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1673
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1688
 msgid ""
 ":\n"
 "\n"
@@ -835,7 +797,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1676
+#: ism/extras/gtk2_immodule/gtkimcontextscim.cpp:1691
 msgid ""
 "\n"
 "\n"
@@ -843,15 +805,46 @@ msgstr ""
 "\n"
 "\n"
 
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:951
-msgid "Enable"
-msgstr "開啟"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:679
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5285
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5475
+msgid "Select input method"
+msgstr "選擇輸入法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:684
+msgid "Set up input methods"
+msgstr "設定輸入法"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2755
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5753
+msgid "close button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:2762
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5750
+msgid "more button"
+msgstr ""
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3733
+#, c-format
+msgid "%s selected"
+msgstr "%s 已選擇"
 
-#. gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-#. gtk_tree_view_column_set_fixed_width (column, 232);
-#: ism/extras/gtk_panel/scim_panel_gtk.cpp:972
-msgid "Name"
-msgstr "名稱"
+#: ism/extras/efl_panel/isf_panel_efl.cpp:3736
+#, c-format
+msgid "Only %s is available"
+msgstr "僅 %s 可用"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5353
+msgid "Input detected from hardware keyboard"
+msgstr "已偵測到自硬體鍵盤輸入"
+
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5278
+#: ism/extras/efl_panel/isf_panel_efl.cpp:5349
+msgid "Tap to use virtual keyboard"
+msgstr "輕觸以使用虛擬鍵盤"
 
 #: ism/utils/scimstringview.c:201
 msgid "Cursor Position"
@@ -1023,560 +1016,191 @@ msgid "The orientation of the tray."
 msgstr "狀態列的方位。"
 
 #. Normal Layout
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "NORMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:184
+#: ism/demos/isf_layout_efl.cpp:212
 msgid "click to enter TEXT"
 msgstr ""
 
 #. Number Layout
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "NUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:188
+#: ism/demos/isf_layout_efl.cpp:216
 msgid "click to enter NUMBER"
 msgstr ""
 
 #. Email Layout
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "EMAIL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:192
+#: ism/demos/isf_layout_efl.cpp:220
 msgid "click to enter EMAIL"
 msgstr ""
 
 #. URL Layout
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "URL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:196
+#: ism/demos/isf_layout_efl.cpp:224
 msgid "click to enter URL"
 msgstr ""
 
 #. Phonenumber Layout
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "PHONENUMBER LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:200
+#: ism/demos/isf_layout_efl.cpp:228
 msgid "click to enter PHONENUMBER"
 msgstr ""
 
 #. IP Layout
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "IP LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:204
+#: ism/demos/isf_layout_efl.cpp:232
 msgid "click to enter IP"
 msgstr ""
 
 #. Month Layout
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "MONTH LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:208
+#: ism/demos/isf_layout_efl.cpp:236
 msgid "click to enter MONTH"
 msgstr ""
 
 #. Number Only Layout
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "NUMBERONLY LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:212
+#: ism/demos/isf_layout_efl.cpp:240
 msgid "click to enter NUMBERONLY"
 msgstr ""
 
-#. Password Layout
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "PASSWORD LAYOUT"
+#. Number Only with signed Layout
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "NUMBERONLY WITH SIGNED LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:216
-msgid "click to enter PASSWORD"
+#: ism/demos/isf_layout_efl.cpp:244
+msgid "click to enter NUMBERONLY WITH SIGNED"
 msgstr ""
 
-#: ism/demos/isf_layout_efl.cpp:234
-msgid "Layout"
+#. Number Only with decimal Layout
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "NUMBERONLY WITH DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:143
-msgid "Previous"
+#: ism/demos/isf_layout_efl.cpp:248
+msgid "click to enter NUMBERONLY WITH DECIMAL"
 msgstr ""
 
-#. service_add_extra_data(ad->data, "navi_btn_left", NULL);
-#: ism/demos/isf_demo_efl.cpp:145
-msgid "Next"
+#. Number Only with signed and decimal Layout
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "NUMBERONLY WITH SIGNED AND DECIMAL LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_demo_efl.cpp:199
-msgid "ISF Demo"
+#: ism/demos/isf_layout_efl.cpp:252
+msgid "click to enter NUMBERONLY WITH SIGNED AND DECIMAL"
 msgstr ""
 
-#: ism/demos/isf_entry_event_efl.cpp:151
-msgid "Entry Event"
+#. Datetime Layout
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "DATETIME LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:232
-msgid "Label Event"
+#: ism/demos/isf_layout_efl.cpp:256
+msgid "click to enter DATETIME"
 msgstr ""
 
-#: ism/demos/isf_event_efl.cpp:262
-msgid "Event"
+#. Password Layout
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "PASSWORD LAYOUT"
 msgstr ""
 
-#: ism/demos/isf_imcontrol_efl.cpp:236
-msgid "IM Control"
+#: ism/demos/isf_layout_efl.cpp:260
+msgid "click to enter PASSWORD"
 msgstr ""
 
-#~ msgid "Keyboards"
-#~ msgstr "英文鍵盤"
-
-#~ msgid "English/European"
-#~ msgstr "英文/歐洲語文"
-
-#~ msgid "RAW CODE"
-#~ msgstr "內碼輸入"
-
-#~ msgid "(C) 2002-2006 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr "(C) 2002-2006 蘇哲 <suzhe@tsinghua.org.cn>"
-
-#~ msgid ""
-#~ "Hot Keys:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    switch between Multibyte encoding and Unicode.\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    reset the input method.\n"
-#~ msgstr ""
-#~ "快捷鍵:\n"
-#~ "\n"
-#~ "  Control+u:\n"
-#~ "    切換地區編碼和 Unicode 編碼。\n"
-#~ "\n"
-#~ "  Esc:\n"
-#~ "    重設輸入法。\n"
-
-#~ msgid "The status of the current input method. Click to change it."
-#~ msgstr "目前輸入法的模式狀態,滑鼠點選可切換模式。"
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Global Setup"
-#~ msgstr "全域設定"
-
-#~ msgid ""
-#~ "Setup the global options used by All FrontEnd modules, including X11 "
-#~ "FrontEnd, GTK IMModule, QT IMModule etc."
-#~ msgstr ""
-#~ "調整所有介面模組的共通設定,包含 X11 介面、GTK+ IMModule、Qt IMModule 等"
-
-#~ msgid "_Trigger:"
-#~ msgstr "作用鍵(_T):"
-
-#~ msgid "Select the trigger keys"
-#~ msgstr "選擇輸入法的作用鍵"
-
-#~ msgid ""
-#~ "The key events to turn on/off SCIM input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用來 開啟/關閉 SCIM 輸入法的作用鍵,點壓該按鈕後可編輯。"
-
-#~ msgid "Turn _On:"
-#~ msgstr "開啟(_O)"
-
-#~ msgid "Select the Turn On keys"
-#~ msgstr "選擇開啟 SCIM 按鍵"
-
-#~ msgid ""
-#~ "The key events to turn on SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來開啟 SCIM 輸入法,點壓該按鈕後可編輯。"
-
-#~ msgid "Turn O_ff:"
-#~ msgstr "關閉 (_F)"
-
-#~ msgid "Select the Turn Off keys"
-#~ msgstr "選擇關閉 SCIM 按鍵"
-
-#~ msgid ""
-#~ "The key events to turn off SCIM input method. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來關閉 SCIM 輸入法,點壓該按鈕後可編輯。"
-
-#~ msgid "_Next input method:"
-#~ msgstr "下一種輸入法(_N):"
-
-#~ msgid "Select the next input method keys"
-#~ msgstr "選擇下一種輸入法按鍵"
-
-#~ msgid ""
-#~ "The key events to switch to the next input method. Click on the button on "
-#~ "the right to edit it."
-#~ msgstr "用來切換至下一種輸入法的按鍵,按鈕上滑鼠點選可編輯。"
-
-#~ msgid "_Previous input method:"
-#~ msgstr "上一種輸入法(_P):"
-
-#~ msgid "Select the previous input method keys"
-#~ msgstr "選擇上一種輸入法按鍵"
-
-#~ msgid ""
-#~ "The key events to switch to the previous input method. Click on the "
-#~ "button on the right to edit it."
-#~ msgstr "用來切換至上一種輸入法的按鍵,點壓按鈕後可編輯。"
-
-#~ msgid "Show input method _menu:"
-#~ msgstr "顯示輸入法選單(_M):"
-
-#~ msgid "Select the show input method menu keys"
-#~ msgstr "選擇顯示輸入法選單按鍵"
-
-#~ msgid ""
-#~ "The key events to show the input method menu. Click on the button on the "
-#~ "right to edit it."
-#~ msgstr "用來顯示輸入法選單的按鍵,點壓按鈕後可編輯。"
-
-#~ msgid "_Keyboard Layout:"
-#~ msgstr "鍵盤排列(_K):"
-
-#~ msgid ""
-#~ "You should choose your currently used keyboard layout here so that input "
-#~ "methods, who care about keyboard layout, could work correctly."
-#~ msgstr "您應適當挑選鍵盤排列方式,這樣輸入法才能正確運作。"
-
-#~ msgid "_Embed Preedit String into client window"
-#~ msgstr "在輸入法客戶端視窗嵌入預先編輯字串(_E)"
-
-#~ msgid ""
-#~ "If this option is checked, the preedit string will be displayed directly "
-#~ "in the client input window, rather than in a independent float window."
-#~ msgstr ""
-#~ "如果勾取這個選項,預先編輯字串將會直接顯示於輸入法客戶端,而非出現於獨立的"
-#~ "浮動視窗"
-
-#~ msgid "_Share the same input method among all applications"
-#~ msgstr "在所有的應用程式共享同樣的輸入法(_S)"
-
-#~ msgid ""
-#~ "If this option is checked, then only one input method could be used by "
-#~ "all applications at the same time.Otherwise different input method could "
-#~ "be used by each application."
-#~ msgstr ""
-#~ "如果啟用本選項,所有應用程式在一時間將只會有一個輸入法,否則個別的應用程式"
-#~ "可以使用不同的輸入法。"
-
-#~ msgid "Hotkeys"
-#~ msgstr "快速鍵"
-
-#~ msgid ""
-#~ "You can enable/disable input methods and set hotkeys for input methods "
-#~ "here."
-#~ msgstr "你可在此開啟或關閉已安裝的輸入法,並設定快速鍵"
-
-#~ msgid "The installed input method services:"
-#~ msgstr "已安裝的輸入法服務:"
-
-#~ msgid "Edit _Hotkeys"
-#~ msgstr "編輯快速鍵(_H)"
-
-#~ msgid "Edit Hotkeys associated with the selected input method."
-#~ msgstr "編輯所選取輸入法關連的快速鍵"
-
-#~ msgid "Select _Filters"
-#~ msgstr "選定的轉換過濾器(_F)"
-
-#~ msgid "Select the Filters which will be attached to this input method."
-#~ msgstr "選擇施加到輸入法的轉換過濾器"
-
-#~ msgid "_Expand"
-#~ msgstr "展開(_E)"
-
-#~ msgid "Expand all language categories."
-#~ msgstr "展開所有語言目錄"
-
-#~ msgid "_Collapse"
-#~ msgstr "折疊(_C)"
-
-#~ msgid "Collapse all language categories."
-#~ msgstr "折疊所有語言目錄"
-
-#~ msgid "E_nable All"
-#~ msgstr "使用所有的輸入法(_E)"
-
-#~ msgid "Enable all input methods."
-#~ msgstr "使用所有輸入法"
-
-#~ msgid "_Disable All"
-#~ msgstr "停用所有輸入法(_D)"
-
-#~ msgid "Disable all input methods."
-#~ msgstr "停用所有輸入法"
-
-#~ msgid "Filters"
-#~ msgstr "轉換過濾器"
-
-#~ msgid "Languages"
-#~ msgstr "語文"
-
-#~ msgid "Description"
-#~ msgstr "描述"
-
-#~ msgid "Edit Hotkeys for %s"
-#~ msgstr "編輯 %s 的快速鍵"
-
-#~ msgid "Select Filters for %s"
-#~ msgstr "編輯 %s 的轉換過濾器"
-
-#~ msgid "Move _Up"
-#~ msgstr "上移(_U)"
-
-#~ msgid "Move _Down"
-#~ msgstr "下移(_D)"
-
-#~ msgid "GTK"
-#~ msgstr "GTK+"
-
-#~ msgid "A panel daemon based on GTK+-2.x library."
-#~ msgstr "一個使用 GTK+-2.x 撰寫的操控面板背景程式。"
-
-#~ msgid "On demand"
-#~ msgstr "需要時"
-
-#~ msgid "Never"
-#~ msgstr "從不"
-
-#~ msgid "ToolBar"
-#~ msgstr "工具列"
-
-#~ msgid "_Show:"
-#~ msgstr "顯示(_S):"
-
-#~ msgid "Auto s_nap"
-#~ msgstr "自動靠邊(_N)"
-
-#~ msgid "Show _input method icon"
-#~ msgstr "顯示輸入法圖示(_I)"
-
-#~ msgid "Show inp_ut method name"
-#~ msgstr "顯示輸入法名稱(_U)"
-
-#~ msgid "Hide time_out:"
-#~ msgstr "逾時隱藏(_O):"
-
-#~ msgid "Show s_tick icon"
-#~ msgstr "顯示固定圖示(_T)"
-
-#~ msgid "Show m_enu icon"
-#~ msgstr "顯示選單圖示(_E)"
-
-#~ msgid "Show _help icon"
-#~ msgstr "顯示求助圖示(_H)"
-
-#~ msgid "Show _property label"
-#~ msgstr "顯示屬性名稱(_P)"
-
-#~ msgid "Input window"
-#~ msgstr "輸入視窗"
-
-#~ msgid "E_mbedded lookup table"
-#~ msgstr "嵌入式選詞列表(_M)"
-
-#~ msgid "_Vertical lookup table"
-#~ msgstr "垂直式選詞列表(_V)"
-
-#~ msgid "Misc"
-#~ msgstr "其它"
-
-#~ msgid "Show tra_y icon"
-#~ msgstr "顯示系統列圖示(_Y)"
-
-#~ msgid "Stick _windows"
-#~ msgstr "固定視窗(_W)"
-
-#~ msgid "_Font:"
-#~ msgstr "字形(_F):"
-
-#~ msgid ""
-#~ "If option \"Always\" is selected, the toolbar will always be shown on the "
-#~ "screen. If option \"On demand\" is selected, it will only be shown when "
-#~ "SCIM is activated. If option \"Never\" is selected, it will never be "
-#~ "shown."
-#~ msgstr ""
-#~ "如果選取「永遠」選項,工具列將永遠顯示在螢幕上。如果選取「需要時」選項,則"
-#~ "只有當 SCIM 被啟用時才會顯示工具列。如果選取「從不」選項,則永遠不會顯示工"
-#~ "具列。"
-
-#~ msgid ""
-#~ "If this option is checked, the toolbar will be snapped to the screen "
-#~ "border."
-#~ msgstr "如果勾取這個選項,工具列將緊黏在螢幕邊緣。"
-
-#~ msgid ""
-#~ "The toolbar will be hidden out after this timeout is elapsed. This option "
-#~ "is only valid when \"Always show\" is selected. Set to zero to disable "
-#~ "this behavior."
-#~ msgstr ""
-#~ "在經過一定時間後,工具列將被隱藏起來,該選項只在選取「永遠顯示」時才會作"
-#~ "用。當設定值為 0 時,將關閉此功能。"
-
-#~ msgid ""
-#~ "If this option is checked, the input method icon will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果勾取這個選項,輸入法圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the input method name will be showed on the "
-#~ "toolbar."
-#~ msgstr "如果勾取這個選項,輸入法名稱將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the stick icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,固定圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the menu icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,選單圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the help icon will be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,求助圖示將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the text label of input method properties will "
-#~ "be showed on the toolbar."
-#~ msgstr "如果勾取這個選項,輸入法屬性的名稱將顯示在工具列上。"
-
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be embedded into the "
-#~ "input window."
-#~ msgstr "如果勾取這個選項,選詞列表將出現在輸入視窗中。"
+#. Terminal Layout
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "TERMINAL LAYOUT"
+msgstr ""
 
-#~ msgid ""
-#~ "If this option is checked, the lookup table will be displayed vertically."
-#~ msgstr "如果勾取這個選項,選詞列表將垂直顯示。"
-
-#~ msgid ""
-#~ "If this option is checked, the tray icon will be showed on the desktop's "
-#~ "taskbar."
-#~ msgstr "如果勾取這個選項,系統圖示將顯示在桌面的工作列上。"
+#: ism/demos/isf_layout_efl.cpp:264
+msgid "click to enter TERMINAL"
+msgstr ""
 
-#~ msgid ""
-#~ "If this option is checked, the toolbar, input and lookup table windows "
-#~ "will be sticked to its original position."
-#~ msgstr "如果勾取這個選項,則輸入和選詞列表視窗將停留在它們的原本位置。"
+#: ism/demos/isf_layout_efl.cpp:304
+msgid "Layout"
+msgstr ""
 
-#~ msgid "The font setting will be used in the input and lookup table windows."
-#~ msgstr "該字形設定將套用於輸入和選詞列表視窗。"
+#: ism/demos/isf_demo_efl.cpp:171
+msgid "ISF Demo"
+msgstr ""
 
-#~ msgid "Select Interface Font"
-#~ msgstr "選擇介面字形"
-
-#~ msgid "SCIM"
-#~ msgstr "SCIM"
-
-#~ msgid "FrontEnd"
-#~ msgstr "介面(前端)"
-
-#~ msgid "IMEngine"
-#~ msgstr "輸入法引擎"
-
-#~ msgid "Panel"
-#~ msgstr "面板"
-
-#~ msgid "Extra"
-#~ msgstr "附加項目"
-
-#~ msgid "SCIM Input Method Setup"
-#~ msgstr "SCIM 輸入法設定"
-
-#~ msgid ""
-#~ " <span size=\"20000\">Smart Common Input Method platform</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-#~ msgstr ""
-#~ " <span size=\"20000\">泛用智慧型輸入法平台</span> \n"
-#~ "\n"
-#~ "<span size=\"16000\" style=\"italic\">圖形介面設定工具</span>\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "<span size=\"12000\">版權所有 2002-2004, 蘇  哲 &lt;suzhe@tsinghua.org."
-#~ "cn&gt;</span>"
-
-#~ msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
-#~ msgstr "<span size=\"x-large\">%s 模組的設定。</span>"
-
-#~ msgid "Are you sure you want to quit SCIM Setup?"
-#~ msgstr "是否關閉 SCIM 設定程式?"
-
-#~ msgid ""
-#~ "Not all configuration can be reloaded on the fly. Don't forget to restart "
-#~ "SCIM in order to let all of the new configuration take effect."
-#~ msgstr "並非所有設定都可以立即生效。別忘了重新啟動 SCIM 來讓新的設定生效。"
+#: ism/demos/isf_entry_event_efl.cpp:149
+msgid "Entry Event"
+msgstr ""
 
-#~ msgid "SCIM Setup"
-#~ msgstr "SCIM 設定"
+#: ism/demos/isf_event_efl.cpp:231
+msgid "Label Event"
+msgstr ""
 
-#~ msgid "Integrated Setup Utility based on GTK Widget library."
-#~ msgstr "以 GTK+ 撰寫的整合設定工具。"
+#: ism/demos/isf_event_efl.cpp:260
+msgid "Event"
+msgstr ""
 
-#~ msgid "Setup utility for Smart Common Input Method platform"
-#~ msgstr "泛用智慧型輸入法平台的設定工具"
+#: ism/demos/isf_imcontrol_efl.cpp:291
+msgid "IM Control"
+msgstr ""
 
-#~ msgid "SCIM Help"
-#~ msgstr "求助 SCIM"
+#~ msgid "English (British)"
+#~ msgstr "英文(英國)"
 
-#~ msgid "Smart Common Input Method"
-#~ msgstr "泛用智慧型輸入法平台"
+#~ msgid "English (American)"
+#~ msgstr "英文(美國)"
 
-#~ msgid "Stick/unstick the input window and the toolbar."
-#~ msgstr "固定/釋開 輸入視窗和工具列。"
+#~ msgid "English (Irish)"
+#~ msgstr "英文(愛爾蘭)"
 
-#~ msgid "Show a brief help about SCIM and the current input method."
-#~ msgstr "顯示關於 SCIM 和目前輸入法的精簡說明。"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "葡萄牙文(巴西)"
 
-#~ msgid "Show command menu."
-#~ msgstr "顯示æ\8c\87令é\81¸å\96®."
+#~ msgid "Malay (Malaysia)"
+#~ msgstr "馬ä¾\86æ\96\87(馬ä¾\86西äº\9e)"
 
-#~ msgid ""
-#~ "\n"
-#~ "(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>"
-#~ msgstr ""
-#~ "\n"
-#~ "(c) 2002-2005 蘇哲 <suzhe@tsinghua.org.cn>"
+#~ msgid "Chinese (PRC)"
+#~ msgstr "中文(中華人民共和國)"
 
-#~ msgid "Reload Configuration"
-#~ msgstr "重新載入設定值"
+#~ msgid "Chinese (Singapore)"
+#~ msgstr "中文(新加坡)"
 
-#~ msgid "Stick Windows"
-#~ msgstr "固定視窗"
+#~ msgid "Uzbek (Latin)"
+#~ msgstr "烏茲別克語(拉丁)"
 
-#~ msgid "Hide Toolbar"
-#~ msgstr "隱藏工具列"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "中文(台灣)"
 
-#~ msgid "Help ..."
-#~ msgstr "求助 ..."
+#, fuzzy
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "中文(香港)"
 
-#~ msgid "Exit"
-#~ msgstr "離開"
+#~ msgid "Spanish (Traditional Sort)"
+#~ msgstr "西班牙文(傳統)"
 
-#~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-#~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+#~ msgid "Spanish (Mexican)"
+#~ msgstr "西班牙文(墨西哥)"
 
-#~ msgid "En"
-#~ msgstr "è\8b±"
+#~ msgid "Virtual keyboard is on"
+#~ msgstr "è\99\9bæ\93¬é\8dµç\9b¤å·²å\95\9fç\94¨"
index a143a0b..29d88f6 100644 (file)
-isf 2.4.7104 :
- 1. increase retry count to to call XOpenDisplay in X11 frontend
+ISF 2.4.7424 :
+ 1. Add bt-service in isf.rule
+ 2. [panel] initialize variable after calling edbus del and close
+ 3. Experimetal code update for TAINTED_STRING issue
 
 
-isf 2.4.7102 :
- 1. Removed setsid() function from ise_preexec
+ISF 2.4.7421 :
+ 1. Remove m4 directory
 
 
-ISF 2.4.7031 :
- 1. Add monitor for OSP IME
+ISF 2.4.7420 :
+ 1. Send ISM_TRANS_CMD_TURN_ON_LOG to helper ISE even though there is not focus in
+ 2. Separate out setting UG package
+ 3. Remove unused file: isfsetting.edc
+ 4. Writing description of some APIs
+ 5. systemd: can not set negative OOMScoreAdjust for user service
+ 6. Do not run scim in daemon mode
+ 7. Make systemd unit file as part of source code
+ 8. Remove unused define in specfile
 
 
-ISF 2.4.7029 :
- 1. [panel] fix indentation
- 2. OSPIME_Support
- 3. [isfsetting] N_SE-55842: newly installed ime isn't shown in the 1st time
- 4. support feedback optionally in build environment
- 5. Remove unused source codes from PanelAgent class
- 6. Reset keyboard ISE when hardware keyboard is disconnected.
- 7. Add executable permission to xorg
- 8. Request to hide candidate when language is changed to English
- 9. Update helper focus_ic by focus_in_helper/focus_out_helper even when H/W keyboard is connecting
+ISF 2.4.7413 :
+ 1. Add isf_control_get_ise_info_and_module_name ()
+ 2. [panel] Applied multi resolution support for candidate items
+ 3. fix prevent issue : uninitialized scalar variable
+ 4. Added sanitize_string to avoid TAINTED_STRING error in Prevent system
+ 5. Re-show ISE panel after scim-helper-launcher process is recovered.
+ 6. Fix prevent issue: integer overflow
+
+
+ISF 2.4.7410 :
+ 1. Remove unused dependency and directory
+
+
+ISF 2.4.7404 :
+ 1. fix bug keyboard remains on menu screen
+ 2. [panel] remove unused variable
+ 3. Remove ui-gadget dependency
+
+
+ISF 2.4.7323 :
+ 1. Remove unnecessary build dependency
+ 2. Remove the duplicated locales
+ 3. Fix the translated message of es_ES locale
+ 4. modified po_file for supported languages
+ 5. [setting] change the name of paramater in create_bg
+
+
+ISF 2.4.7320 :
+ 1. Add ComposeKeyFactory when no one IMEngine is installed
+ 2. modified minicontrol UI
+ 3. [setting] add right margin to the supported language list view
+
+
+ISF 2.4.7316 :
+ 1. Modified po_file for the supported languages
+ 2. add vconf smack rule
+ 3. Add writing permission about vconf_network
+
+
+ISF 2.4.7313 :
+ 1. Fix build warning
+ 2. compile with dlog headers and libs
+ 3. [panel] remove unused code
+ 4. [panel] rename function to get angle of window
+
+
+ISF 2.4.7307 :
+ 1. [panel] Freeze event of set up input methods button to avoid launch UG multiple times
+ 2. [panel] Use ecore_x_event_mask_set or unset instead of XSelectInput for considering the used property
+ 3. [panel] create function to get window rotate angle
+ 4. [panel] Use quickpanel window angle instead of root window angle
+
+
+ISF 2.4.7306 :
+ 1. code refinement related to key modifier and lock
+ 2. support super key (between ctrl and alt key)
+ 3. check the keyboard mode when the immodule init
+ 4. modified po_file for Uzbek
+ 5. Set active ISE to Helper ISE when unpluging USB keyboard
+ 6. showing S/W keyboard when the keyboard mode is changed from H/W to S/W
+
+
+ISF 2.4.7231 :
+ 1. Remove ctrl + alt + right key in Tizen
+
+
+ISF 2.4.7230 :
+ 1. Add latin-1 key codes
+ 2. changed root window to input window about the PROP_X_EXT_KEYBOARD_EXIST property
+ 3. [panel] Delete destroy timer after candidate window is shown
+
+
+ISF 2.4.7227 :
+ 1. Revert "Add missing table in __scim_key_by_name
+ 2. Do not detect H/W keyboard mode when Power + volume down key is pressed.
+
+
+ISF 2.4.7226 :
+ 1. changed the conditions of detecting H/W keyboard input
+ 2. set the root window property for other apps temporarily
+ 3. Add missing table in __scim_key_by_name
+
+
+ISF 2.4.7223 :
+ 1. Show warning when it failed to access ISE file
+ 2. [panel] Add focus rectangle for candidate TTS feature
+ 3. changed root_win property to control_win property about checking the keyboard mode
+
+
+ISF 2.4.7220 :
+ 1. [panel] Add flick event for candidate TTS feature
+ 2. Add missing key to unicode table
+ 3. [panel] rename variable for radio group for ISE selector
+
+
+ISF 2.4.7218 :
+ 1. modified unnecessary logic and variable for checking keyboard mode
+ 2. [panel] add log when it failed to access ise module
+ 3. Fix issue the support languages of IMEngine updates wrong when display language is changed
+
+
+ISF 2.4.7216 :
+ 1. [panel] delete ise selector when process exits
+ 2. Fix issue IME hide when 'set up input methods' button is pressed
+ 3. Calling ecore_evas_move_resize () with proper values to avoid candidate disappears unexpectedly
+ 4. destroy ISE selector even though it failed to launch UG
+
+
+ISF 2.4.7213 :
+ 1. [panel] fix prevent control flow issues
+ 2. [isf-panel-efl] Fix long candidate showing issue
+
+
+ISF 2.4.7212 :
+ 1. [panel] change list theme of ise selector
+ 2. [panel] Add icon for ise selector
+ 3. [panel] show ise selector if the size of helper is more than 1
+
+
+ISF 2.4.7211 :
+ 1. Create minicontrol class for reusability
+ 2. Modified the candidate window to respect the ISE's angle
+ 3. Modified the panel to hide ISE on app window's focus out event
+ 4. Change return type of get_ise_index ()
+ 5. Add IME selector
+ 6. Fix window stacking issue of ISE selector
+ 7. Fix issue multiple ISE selectors are created
+
+
+ISF 2.4.7210 :
+ 1. Added code for exceptional logic error case related to gettimeofday
+
+
+ISF 2.4.7209 :
+ 1. Fix prevent issue: dereference after null check
+ 2. Add Select input method, Set up input methods string
+ 3. Fixed the bug that dlopen'ed handle is not being closed
+ 4. Added translated text for select input method, set up input methods
+
+
+ISF 2.4.7206 :
+ 1. Separated angle updating code for candidate and ISE, and renamed _window_angle to _ise_angle
+ 2. Modified SCIM process for launching OSPIMEs with root privilege
+ 3. Revert "Modify manifest to execute isf-query-engines"
+ 4. Add rule for security-server smack
+ 5. Refactoring mini control for detecting H/W keyboard
+ 6. added the translated text for "Only %s is available"
+ 7. Check whether parameter is NULL or not before deleting edbus signal handler
+ 8. [isf-panel-efl] Check _candidate_pop_image_count
+
+
+ISF 2.4.7204 :
+ 1. Modify manifest to execute isf-query-engines
+ 2. fix bug not to send hide state event when window manager hides IME
+
+
+ISF 2.4.7130 :
+ 1. Remove ctrl+alt+up/down key
+ 2. [isfsetting]fixed some bug which the name of hardware ise is shown in ise language view
+ 3. change build feature for logging on user binary
+ 4. added notification message when the H/W keyboard engine is changed
+
+
+ISF 2.4.7128 :
+ 1. modified minicontrol GUI to fix hidden text
+ 2. Use timestamp to check whether key event is sent from S/W keyboard
+ 3. Temporarily modified not to limit the size of candidate object
+ 4. updated the translated text of the supporting language list
+ 5. Even when geometry is reported from ISE, set w/h to 0 when not in SHOW state
+ 6. Use LOGW when operation fails
+
+
+ISF 2.4.7125 :
+ 1. change manifest for security
+ 2. [panel] Accept ISE_SHOW request only when the toolbar mode is HELPER_MODE
+ 3. [panel] Modified to emit show/hide signals only when succeeded
+ 4. [panel] Add check condition
+
+
+ISF 2.4.7121 :
+ 1. Add es_US in languages
+ 2. Fix locale from no_NO to nb_NO for Norsk (Bokmal)
+
+
+ISF 2.4.7120 :
+ 1. Remove english keyboard in H/W keyboard list
+ 2. Modified to update keyboard geometry when a new application requests to show our already-visible ISE
+ 3. Added debug message for checking forward_key_event
+
+
+ISF 2.4.7118 :
+ 1. skip to analyze surrounding text for autocapital in case of updating preedit
+ 2. Fix P131114-00886 [Improve candidate expand performance]
+ 3. [isfsetting]add hardware ise languge view.
+ 4. Add log in case key event is ignored
+ 5. Modified to update keyboard geometry before CANDIDATE_HIDE event
+ 6. removed notification message(virtual keyboard is on)
 
 
-ISF 2.4.7023 :
- 1. Support ESC key to hide IME
- 2. Fix more button hide issue
+ISF 2.4.7112 :
+ 1. Added wm_ready waiting code in SCIM and increased retry count of scim_socket_open_connection in HelperAgent
 
 
-ISF 2.4.7022 :
- 1. add NULL check of p->name in scim_string_to_key ()
- 2. check whether length is NULL or not in imdata_get
+ISF 2.4.7111 :
+ 1. [efl_immodule] Hide candidate when ic is turn off
+ 2. Add missing table to convert from key to unicode
+ 3. Fixed the bug that keyboard geometry is invalid when forcefully hidden by window manager
+ 4. fix unchecked return value issue from prevent
+ 5. Added WILL_SHOW condition to the late XID-report recovery case
+ 6. Add warning log when minicontrol_win_add failed
+ 7. Remove code to wait appservice ready
+
+
+ISF 2.4.7107 :
+ 1. Set transient_for when XID notified, if reported later than show_ise request
+ 2. Added logs for checking the HelperAgent's open_connection() failure
+ 3. added checking code of candidate mode when candidate show, create functions are called
+ 4. Modified to retry scim_socket_open_connection() in HelperAgent
+ 5. modified GUI of the seperate bar with reference GUI guide
+ 6. Add isf_control_set_initial_ise_by_uuid () API
+ 7. Fixed the bug that keyboard geometry is invalid when forcefully hidden by window manager
+
+
+ISF 2.4.7106 :
+ 1. Changed retry counts for socket config
+ 2. Modified to cache client window id
+ 3. fixed autoscroll problem of candidate area
+ 4. fix coding style
+ 5. Modified to provide a little more information when leaving a log
+
+
+ISF 2.4.7102 :
+ 1. Modified socket connection wait time
+ 2. Modified to set show_requested to TRUE even when candidate is in SHOW state
+ 3. Added window checking code when _prop_change is called
+ 4. add to display focus window in show request log
+ 5. Modified to wait a certain time before launching a new socket FrontEnd
+ 6. Added more waiting code before launching a new socket FrontEnd
+ 7. change from LOGD to LOGW when connection is failed
+ 8. change check logic of IME state in input_panel_show request
+ 9. Show warning when client window is different from focus window
+
+
+ISF 2.4.7031 :
+ 1. Add monitor for OSP IME
+ 2. Fixed prevent defect
+ 3. [isfsetting] call update_ise_list() first to refresh the engine_list, then load the ise info.
+ 4. support feedback optionally in build environment
+
+
+ISF 2.4.7024 :
+ 1. Remove unused source codes from PanelAgent class
+ 2. Support ESC key to hide IME
+ 3. Optimization for utf8_read_wchar() and utf8_mbtowc()
+ 4. Optimization for open_connection()
+ 5. add NULL check of p->name in scim_string_to_key ()
+ 6. Add commit_string(char*) and update_preedit_string(char*)
+ 7. Modified to send HelperEvent only to the focused_ic
+ 8. Modified to update ISE geometry whenever reported
+ 9. Removed unreachable code
+10. Fix more button hide issue
+11. Reset keyboard ISE when hardware keyboard is disconnected
+12. added deinitialize code of callback function for bluetooth
+13. Modified to send candidate messages only to the focused_ic
+14. conditional use bluetooth library
+
+
+ISF 2.4.7021 :
+ 1. Add Soft ISE H/W keyboard support
+ 2. Add executable permission to xorg
  3. Fix crash issue when ic->impl is equal to NULL in slot_send_helper_event
- 4. fix crash issue in case ecore_imf_context_del () is called in preedit-changed, commit, and so on callback
+ 4. check whether length is NULL or not in imdata_get
 
 
 ISF 2.4.7017 :
- 1. Modified to set show_requested to TRUE even when candidate is in SHOW state
- 2. check cursor position to disable return key in case of focus-in event
+ 1. added Bluetooth connection callback for unrecognized BT Keyboard
+ 2. fix crash issue in case ecore_imf_context_del () is called in preedit-changed, commit, and so on callback
+ 3. Remove to set default IMEngine
+
+
+ISF 2.4.7015 :
+ 1. Fix bug candidate window disappears late when hardware keyboard is connected
+ 2. Set default ISE before running helper
+ 3. Fixed autoscroll update logic for previous window and window manager's forceful keyboard hide event
+ 4. fix bug hide request wasn't sent even though the client window lost focus
+
+
+ISF 2.4.7014 :
+ 1. Changed to launch panel process with socket config
+ 2. Change default IMEngine factory
+ 3. Revert "Change process account of scim-launcher, isf-panel-efl"
+ 4. [demo] check cursor position to disable return key in case of focus-in event
+ 5. Fixed the problem when candidate turns back to SHOW state from WILL_HIDE state
+ 6. Modified to hide candidate window when switching back to SW keyboard mode
+ 7. Modified to open candidate window whenever ISE is on, unless HIDE is requested explicitly
+ 8. Request to hide candidate when language is changed to English
+ 9. Update helper focus_ic by focus_in_helper/focus_out_helper even when H/W keyboard is connecting
+ 10.Applied new process launching policy
 
 
 ISF 2.4.7010 :
- 1. fix bug candidate window disappears late
- 2. initialize cursor position as -1 in focus-out
- 3. fix typo in comments
- 4. Modified to open candidate window whenever ISE is on, unless HIDE is requested explicitly
+ 1. fix bug keyboard remains on menu screen
+ 2. [setting] fix typo in comments
+ 3. Change process account of scim-launcher, isf-panel-efl
+ 4. [immodule] initialize cursor position as -1 in focus-out
 
 
-ISF 2.4.7008 :
- 1. Revert "fix bug the font of candidate word isn't changed according to the change of system font"
- 2. Modified to hide candidate window when switching back to SW keyboard mode
- 3. modified po file for the wrong word of French
+ISF 2.4.7007 :
+ 1. modified po file for the wrong word of French
+ 2. added the access info of more button for screen reader
+ 3. [immodule] remove unused dependency
+ 4. Modified to update keyboard geometry when STATE_OFF is received without OFF_PREPARE
+ 5. Added hw keyboard mode checking routine when settling candidate window
 
 
-ISF 2.4.7001 :
- 1. fix bug the font of candidate word isn't changed according to the change of system font
- 2. Prevent fix
- 3. Make sure the hidden keyboard is located outside of display area
- 4. Fix candidate window hide issue
+ISF 2.4.7002 :
+ 1. modified the execution condition of candidate feedback depending on the keyboard setting
 
 
-ISF 2.4.6927 :
- 1. [isfsetting] when getting ise info failed, exit the ug
+ISF 2.4.7001 :
+ 1. fix prevent issue about uninitialized value
  2. Use temporary file when re-write ISE cache file
- 3. fix prevent issue about uninitialized value
- 4. Send input panel event to show_request client
- 5. fr po issue
- 6. Remove autoperiod menu
- 7. Fix P130924-00625
- 8. Change translation about auto punctuate
- 9. change the word as their language in keyboard selection windows
-10. Modified to preserve geometry information provided by ISE
-11. Changed set_keyboard_geom interface to support update_ise_geometry
-12. Assume ISE still active when settle candidate window even in WILL_HIDE state
-13. Fixed some cases that CANDIDATE_WILL_HIDE does not work properly
-14. Do not move candidate window if ISE and candidate window are both in WILL_HIDE state
-15. Modified to hide candidate window when WILL_HIDE ack received
-16. Remove off_prepare_timer when WILL_HIDE_ACK received
-17. Added state checking code before transition to WILL_* state
-18. Use ISE/candidate state variables instead of state-specific flags
-19. Clarified the usage of keyboard geometry related functions
-20. Fixed the candidate window being displayed improperly by hide timer
-21. Register render_flush callback for candidate window when KEYBOARD_STATE changes
-22. Fixed prevent defects
-23. Modified the scim_socket to connect in nonblocking way
+ 3. Prevent fix
+ 4. [isfsetting] add protection when loading ise info
+ 5. Make sure the hidden keyboard is located outside of display area
+ 6. update po files
+ 7. fix bug the font of candidate word isn't changed according to the change of system font
+
+
+ISF 2.4.6926 :
+ 1. Fix P130924-00625
+ 2. [setting] Remove autoperiod menu
+ 3. fix P130925-00022: po issue
 
 
 ISF 2.4.6925 :
- 1. fix flicker problem in setting
- 2. fix bug H/W keyboard selection is enabled after disconnecting H/W keyboard
- 3. check NULL pointer before accessing pointer
+ 1. fix bug hide event callback wasn't called when context is deleted
+ 2. Do not move candidate window if ISE and candidate window are both in WILL_HIDE state
+ 3. fix N_SE-52363
+ 4. Fixed some cases that CANDIDATE_WILL_HIDE does not work properly
+ 5. Assume ISE still active when settle candidate window even in WILL_HIDE state
+ 6. Changed LOGI to LOGD for isf_save_log messages
+ 7. initialize current helper uuid when stop_helper () is called
+ 8. Save current active X window ID in focus-in for candidate window
+ 9. Replace SocketConfig reload with HelperAgent reload
+ 10.Keyboard show/hide toggle key should work in input panel is controlled manually
+ 11.Changed set_keyboard_geom interface to support update_ise_geometry
+ 12.Modified to preserve geometry information provided by ISE
+ 13.Send input panel event to show_request client
+ 14.fix N_SE-50420
 
 
-ISF 2.4.6924 :
- 1. Replace SocketConfig reload with HelperAgent reload
- 2. [immodule] Save current active X window ID in focus-in for candidate window
+ISF 2.4.6916 :
+ 1. Modified to hide candidate window when WILL_HIDE ack received
 
 
-ISF 2.4.6923 :
- 1. initialize current helper uuid when stop_helper () is called
+ISF 2.4.6912 :
+ 1. Fix candidate window hide issue in email app
 
 
-ISF 2.4.6917 :
- 1. [isfsetting] fix N_SE-52363
- 2. fix bug hide event callback wasn't called when context is deleted
+ISF 2.4.6911 :
+ 1. Add dim background when candidate window is expanded
+ 2. Fix WILL_SHOW state missing issue
+ 3. Clarified the usage of keyboard geometry related functions
+ 4. Use ISE/candidate state variables instead of state-specific flags
+ 5. Added state checking code before transition to WILL_* state
 
 
-ISF 2.4.6916 :
- 1. remove code to send will_show_ack
- 2. changed logic location of checking pre_uuid
- 3. Hide IME when H/W back key is released even though there is no focus
- 4. conditional use tts library
- 5. Fix WILL_SHOW state missing issue
+ISF 2.4.6910 :
+ 1. Remove send_candidate_will_hide_ack from IMControlClient
+ 2. Share single imengine between applications
+ 3. Add get_selection and set_selection
+ 4. Register render_flush callback for candidate window when KEYBOARD_STATE changes
+ 5. Fixed the candidate window being displayed improperly by hide timer
+ 6. Release configbase when App exiting
 
 
 ISF 2.4.6909 :
- 1. Release configbase when App exiting
- 2. Add soft candidate interface
- 3. Remove send_candidate_will_hide_ack from IMControlClient
- 4. Change pagesize to 2 bytes
- 5. Solve input_panel_state_get issue
- 6. Avoiding keyboard flickering when focus out,reset and commit string
- 7. Use non-blocking mode socket
- 8. Update gtkimcontextscim.cpp and scim_x11_frontend.cpp for PanelClient
- 9. Add SCIM_IME_SUPPORT_LANGUAGE_TOGGLE_KEY option for keyboard ISE
-10. add exit test case
+ 1. Sends PANEL_HIDE message even candidate is visible
+
+
+ISF 2.4.6905 :
+ 1. Change pagesize to 2 bytes
 
 
 ISF 2.4.6904 :
- 1. Fix bug candidate window hide after 1 sec when application is terminated
- 2. [efl_setting] Update Makefile.am
- 3. Donot call getpid () for DLOG
- 4. Remove unused source codes
- 5. Use singleton config instance
- 6. call reset after hiding IME for avoiding the blink of candidate window
- 7. call ecore_imf_context_reset when H/W back key is released
- 8. Fix bug IME remains show status even though application terminated
- 9. Send hide request in case of abnormal exit
-10. fix N_SE-50420
-11. Change SCIM_LOOKUP_TABLE_MAX_PAGESIZE to 300
-12. [efl_immodule] Merge IMControlClient function into PanelClient
-13. Fix bug candidate window disappear after about 1 sec in H/W keyboard mode
-14. delete candidate timer when candidate window is hidden
-15. Modified to update window_angle when ROT_CHANGE_REQ recved from ISE
-16. Modified to show candidate window without visibility checking
-17. Added code for resetting candidate_will_hide flag
-18. [scim-launcher] set locale
-19. Fix bug the name of heleper or engine displays as gettext ID
-20. remove candidate rotation code in update_ise_geometry, Add candidate close code for rotation
-21. remove code to set ELM engine and fps
-22. modify log information and level
-23. Enable feedback (sound & vibration) on candidate item
-24. Remove unused declaration
-25. skip will show sync to improve the performance of show effect
-26. [panel] Set SIP status in vconf
+ 1. Fix bug IME remains show status even though application terminated
+ 2. [immodule] remove unused code
+ 3. [scim-launcher] set locale
+ 4. fix:when switching between hardware and software keyboard, the config reload signal isn't emitted to hardware ise.
+ 5. changed background image of candidate
+ 6. Added code for resetting candidate_will_hide flag
+ 7. Modified to show candidate window without visibility
+ 8. Modified to update window_angle when ROT_CHANGE_REQ
+ 9. Fix bug candidate window disappear after about 1 sec in H/W keyboard mode
+10. Fix bug candidate window hide after 1 sec when application is terminated
+11. delete candidate timer when candidate window is hidden
+
+
+ISF 2.4.6902 :
+ 1. [isf-panel-efl] Add logs
+ 2. Fix bug the name of heleper or engine displays as gettext ID
 
 
 ISF 2.4.6829 :
- 1. Change label of UG
- 2. Add autocapital type in isecontext
- 3. Reduce the number of dlog lines in immodule
- 4. [isfsetting] fix N_SE-50147
+ 1. [setting] fix nabi N_SE-49587
+ 2. skip checking autocapital in H/W keyboard mode
+ 3. Use non-blocking mode socket
+ 4. Add autocapital type in isecontext
+ 5. Revert "temporary disable to query engine name due to engine B/S issue"
+ 6. [setting] fix N_SE-50147
+ 7. Solve input_panel_state_get issue
+ 8. Change label of UG
 
 
-ISF 2.4.6827 :
- 1. [immodule] call prediction_allow_set in IMEngine in case of only having focus
- 2. [immodule] skip checking autocapital in H/W keyboard mode
- 3. Reduce binary size gc-sections
- 4. [setting] fix N_SE-49587 allow duplicated ise name now
+ISF 2.4.6823 :
+ 1. remove candidate rotation code in update_ise_geometry, Add candidate close code for rotation
+ 2. temporary disable to query engine name due to engine B/S issue
 
 
-ISF 2.4.6815 :
- 1. Change "English/Keyboard" to "English Keyboard"
- 2. [immodule] Fix bug of autocapital analysis
- 3. Include unistd.h in scim_helper.cpp
+ISF 2.4.6822 :
+ 1. Remove unused set_isf_language from PanelAgent
+ 2. [immodule] Hide IME when H/W back key is released even though there is no focus
+ 3. [demo] add exit test case
+ 4. [immodule] Send hide request in case of abnormal exit
+ 5. [immodule] call prediction_allow_set in IMEngine in case of only having focus
 
 
-ISF 2.4.6801 :
- 1. [panel] set window angle value in ECORE_X_VIRTUAL_KEYBOARD_STATE_ON
- 2. [panel] set _app_window value in efl_get_app_window API
- 3. [panel] set keyboard geometry at _ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST status
- 4. [panel] set _app_window before set_keyboard_geometry_atom_info in slot_show_ise()
+ISF 2.4.6819 :
+ 1. Add candidate will hide feature (Merge from RSA)
+ 2. Update gtkimcontextscim.cpp and scim_x11_frontend.cpp for PanelClient
+ 3. Fix imdata_get issue
 
 
-ISF 2.4.6729 :
- 1. [panel] Disabled auto_throttle feature
+ISF 2.4.6815 :
+ 1. Change "English/Keyboard" to "English Keyboard"
+ 2. Include unistd.h in scim_helper.cpp
+ 3. Reduce binary size by compiler option "gc-sections"
 
 
-ISF 2.4.6725 :
- 1. [immodule] fix crash because of invalid show request input context
- 2. [immodule] fix crash issue on OSP application
+ISF 2.4.6814 :
+ 1. Reduce the number of dlog lines in immodule
+ 2. Fix socket pair issue for PanelClient
 
 
-ISF 2.4.6719 :
- 1. [panel] check candidate window status on OFF_PREPARE
- 2. [setting] fix N_SE-46950: reset _hw_ise_bak when switching software keyboard leads to hardware keyboard engine changed.
+ISF 2.4.6813 :
+ 1. Support ondemand mode. IME will show according to only mouse up event (not focus) in on-demand mode
+ 2. [demo] Add ondemand demo code
+ 3. modify log information and level
+ 4. call ecore_imf_context_reset when H/W back key is released
+ 5. Revert "temporary disable to query engine name due to engine B/S issue"
+ 6. remove code to set ELM engine and fps
+ 7. merge from RSA (fix candidate rotation problem, candidate window settle problem)
+ 8. Fixed prevent defects
 
 
-ISF 2.4.6717 :
- 1. [panel] Add window angle for get_ise_geometry
- 2. [panel] check ise_show status in settle function
+ISF 2.4.6807 :
+ 1. Add SCIM_IME_SUPPORT_LANGUAGE_TOGGLE_KEY option for keyboard ISE
+ 2. [panel] temporary disable to query engine name due to engine B/S issue
 
 
-ISF 2.4.6716 :
- 1. [panel] remove _candidate_angle change code in get_ise_geometry
- 2. [panel] change candidate window max value
- 3. [panel] check ise_height in settle function
- 4. [panel] fix settle height
+ISF 2.4.6806 :
+ 1. [setting] check NULL pointer before accessing pointer
+ 2. [panel] Enable feedback (sound & vibration) on candidate item
+ 3. [panel] set max width for candidate item
 
 
-ISF 2.4.6715 :
- 1. Use dlog instead of std::cerr
- 2. [panel] fix unchecked return value
- 3. [demo] Use ea_editfield
+ISF 2.4.6803 :
+ 1. [immodule] Fix bug of autocapital analysis
+ 2. [setting] fix bug H/W keyboard selection is enabled after disconnecting H/W keyboard
+ 3. Add Engineering mode for dlog
+ 4. Use LOGI instead of LOGD to display log
 
 
-ISF 2.4.6712 :
- 1. Fix wrong candidate angle affects the geometry of ISE
- 2. Refined the routine for updating ISE size information
- 3. Changed to relocate candidate window instead of hiding it when H/W keyboard attached
- 4. check hardware keyboard status before set active ise
+ISF 2.4.6802 :
+ 1. Modified the scim_socket to connect in nonblocking way
+ 2. [setting] Remove autocapital option
+ 3. [setting] Remove unused code related to autocapital option
+ 4. Fix hide message missing issue when context is deleted
 
 
-ISF 2.4.6711 :
- 1. Add dbus smack rule for setting UG
- 2. [setting] update current keyboard engine on on_resume
- 3. [setting] check hardware mode before back hw_keyboard_selection_view_set_cb
+ISF 2.4.6731 :
+ 1. [immodule/setting/helper_launcher] Use singleton config instance
+ 2. Add Engineering mode for dlog
+ 3. skip will show sync to improve the performance of show effect
 
 
-ISF 2.4.6709 :
- 1. fix candidate window stacking bug
- 2. Add smack rule for dbus
+ISF 2.4.6730 :
+ 1. Fix hide message missing issue when focus out;
+ 2. Change SCIM_LOOKUP_TABLE_MAX_PAGESIZE to 300;
 
 
-ISF 2.4.6703 :
- 1. keyboard setting view should be changed according to H/W keyboard connection
- 2. check return value of pkgmgr function
+ISF 2.4.6727 :
+ 1. [panel] fix N_SE-46950: reset _hw_ise_bak when switching software keyboard leads to hardware keyboard engine changed.
+ 2. [immodule] Merge IMControlClient function into PanelClient
+ 3. [panel] Update logs and format codes
+ 4. [panel] Disabled auto_throttle feature
 
 
-ISF 2.4.6702 :
- 1. Add smack rule
+ISF 2.4.6717 :
+ 1. [panel] fix prevent issue - unchecked return value
+ 2. change the word as their language in keyboard selection windows
+ 3. [panel] Use dlog instead of std::cerr
+ 4. [immodule] Avoiding keyboard flickering when focus out,reset and commit string
+ 5. [panel] Changed to relocate candidate window instead of hiding it when H/W keyboard attached
+ 6. [panel] Refined the routine for updating ISE size information
+ 7. [immodule] fix crash because of invalid show request input context
 
 
-ISF 2.4.6628 :
- 1. [immodule] fix bug back key isn't propagated in H/W keyboard mode
- 2. Change word to newly translated word
+ISF 2.4.6715 :
+ 1. [setting] check hardware keyboard status before set active ise
+ 2. [demo] Use ea_editfield
+ 3. [immodule] fix crash issue on OSP application
 
 
-ISF 2.4.6624 :
- 1. [setting,demo] support back key
+ISF 2.4.6711 :
+ 1. [setting] check return value of pkgmgr function
+ 2. [setting] keyboard setting view should be changed according to H/W keyboard connection
+ 3. Add smack rule for dbus
+ 4. [panel] fix bug of candidate window's stacking issue
+ 5. [setting] update current keyboard engine on on_resume
+ 6. Add dbus smack rule for setting UG
+ 7. Add Dbus code for remove unknown keyboard
+ 8. check hardware mode before back hw_keyboard_selection_view_set_cb
+
+
+ISF 2.4.6703 :
+ 1. fix bug back key isn't propagated in case of H/W keyboard mode
+ 2. fix prevent issue. check return value of ecore_x_window_prop_card32_get
+ 3. Add smack rule
 
 
-ISF 2.4.6621 :
- 1. [setting] Add smack rule for supporting screen reader
- 2. [immodule] fix bug hide request was discarded
+ISF 2.4.6628 :
+ 1. Add candidate will hide function
+ 2. Add user space smack rule for set_active_ise_by_uuid
+ 3. Change word to newly translated word
 
 
-ISF 2.4.6620 :
- 1. [demo] remove code for terminating app when END key is pressed
- 2. [setting] Change naviframe back key event handling
- 3. [demo] change code to process back button
- 4. [immodule] check reverse question mark and exclamation mark to check autoperiod
- 5. [immodule] fix autoperiod bug
- 6. [immodule] support japanese auto punctuation
- 7. [immodule] improve autocapital condition check code
- 8. [immodule] Remove unnecessary config reload call
- 9. [panel] Add preedit window
-10. Add interface update_preedit_string_with_caret()
-11. [panel] Added timer for off_prepare_done
-12. Add launch/destroy/show/hide logs for scim-helper-launcher
+ISF 2.4.6624 :
+ 1. add tts-server in smack rule
+ 2. fix bug hide request was dicarded
 
 
 ISF 2.4.6619 :
- 1. [immodule] fix issue IME is hidden late in application does heavy job
- 2. [panel] Separated GEOMETRY_EVENT from set_keyboard_geometry_atom_info()
- 3. [immodule] fix prevent issue
- 4. [immodule] Added log for checking the render_flush time
- 5. [immodule] fix BS issue when S/W keyboard selection is selected
- 6. [immodule] fix bug focus-in message couldn't be transferred
- 7. [immodule] remove unnecessary prepare and send
- 8. [panel] Add screen reader feature
- 9. [immodule] change DLOG tagname of immodule
-10. [SMACK] Move smack rule into separate rule file
+ 1. [setting/demo] support back key
+ 2. [iimmodule] change DLOG tagname of immodule
+ 3. [panel] remove code to set power manager vconf key
+ 4. [immodule] fix issue IME is hidden late in application does heavy job
+ 5. [immodule] fix bug focus-in message couldn't be transferred
+ 6. [immodule] remove unnecessary prepare and send
+ 7. [setting] fix flicker problem in setting
+
+
+ISF 2.4.6617 :
+ 1. Add launch/destroy/show/hide logs for scim-helper-launcher
+
+
+ISF 2.4.6614 :
+ 1. Remove unused source codes
+ 2. Solve aux/candidate selection event broadcast issue
+ 3. support toggle key for hardware keyboard
+ 4. Remove gtk_panel source codes
+ 5. Remove keyboard wizard source codes
+ 6. Add interface update_preedit_string_with_caret()
+ 7. [demo] remove debug printf
+ 8. [panel] Separated GEOMETRY_EVENT from set_keyboard_geometry_atom_info()
+ 9. change input detect method for hardware keyboard
+10. [immodule] IME should not be shown in the disabled context
+11. [immodule] fix prevent issue
+12. [setting] fix BS issue when S/W keyboard selection is selected
+13. [immodule] Added log for checking the render_flush time
+14. [immodule] fix hardware detection code in filter_event (change compare statement of timestamp)
+15. [panel] Added timer for off_prepare_done
 
 
-ISF 2.4.6610 :
- 1. Revert "move hide timer from immodule to panel"
- 2. Revert "Discard input keys that does not match with current ic value"
+ISF 2.4.6605 :
+ 1. [immodule] fix memory leak about ecore_imf_context_surrounding_get
+ 2. [immodule] fix back space issue in MBE
 
 
-ISF 2.4.6607 :
- 1. [immodule] fix back space issue in MBE
- 2. Remove gtk_panel source codes
- 3. Solve aux/candidate selection event broadcast issue
- 4. Remove keyboard wizard source codes
- 5. move hide timer from immodule to panel
+ISF 2.4.6604 :
+ 1. Change notification smack rule
+ 2. Discard input keys that does not match with current ic value
+ 3. add fa.po th.po ur.po
 
 
-ISF 2.4.6605 :
- 1. [panel] Call window_rotation_app_set for ROOT_ANGLE_ROTATE
- 2. [immodule] send show callback when show is requested after focused context is deleted
- 3. [panel] fix flickering problem at more and close button clicked
- 4. [immodule] Discard input keys that does not match with current ic value
- 5. add fa.po th.po ur.po
- 6. [immodule] fix memory leak issue when ecore_imf_context_surrounding_get is used
+ISF 2.4.6531 :
+ 1. [immodule] send show callback when show is requested after focused context is deleted
 
 
 ISF 2.4.6530 :
- 1. [demo] Add DATETIME layout
- 2. [setting] support Farsi, Thai, and Urdu language
+ 1. [immodule] Support japanese auto punctuation
 
 
 ISF 2.4.6529 :
- 1. [immodule] Add focus window check routine
+ 1. [immodule] Set shift_mode_enabled to false as default
+ 2. [demo] add datetime layout
+ 3. [immodule] Add focus window check routine
+ 4. Modified the update_preedit_string() function to work properly even the preedit string is empty
 
 
 ISF 2.4.6527 :
+ 1. [setting] Change naviframe back key event handling
+ 2. [immodule] Set shift_mode_enabled to false as default
+
+
+ISF 2.4.6523 :
  1. [setting] fix abort issue in case EFL abort option turn on
- 2. [demo] Use the window manager rotation
+ 2. [panel] fix candidate blink bug at angle 180, 270
+ 3. [demo] Use the window manager rotation
 
 
-ISF 2.4.6520 :
+ISF 2.4.6521 :
  1. fix build error on GCC 4.7.3
- 2. [setting] fix prevent issue
- 3. [immodule] fix bug hide_lookup_table doesn't work in set_layout of IMEngine
- 4. [immodule] prepare and send is needed when set_prediction_allow is called in IMEngine
+ 2. [immodule] fix bug hide_lookup_table doesn't work in set_layout of IMEngine
+ 3. [immodule] prepare and send is needed when set_prediction_allow is called in IMEngine
+ 4. [panel] Add screen reader feature
 
 
-ISF 2.4.6508 :
- 1. Set default language for isf_get_normalized_language ()
- 2. check cursor index of ecore_imf_context_surrounding_get
+ISF 2.4.6516 :
+ 1. Fix display number defect;
 
 
-ISF 2.4.6507 :
- 1. [immodule] fix bug show request was ignored after input panel hide is called but hide state callback wasn't called
+ISF 2.4.6515 :
+ 1. Change translation about auto punctuate
+ 2. [panel] Set SIP status in vconf
 
 
-ISF 2.4.6506 :
- 1. [immodule] fix crash issue if cursor position value is more than the length of surrounding text
- 2. [immodule] fix autoperiod bug
- 3. [immodule] support autocapital for continuous space
+ISF 2.4.6513 :
+ 1. Revert "Set Smack label for supporting OSP IMEs"
 
 
-ISF 2.4.6430 :
- 1. [panel] Hide close button if no more item in candidate window
- 2. [panel] Modified to set transient_for before showing candidate window
+ISF 2.4.6509 :
+ 1. check connection status of hardware keyboard for disconnect
+ 2. [panel] set keyboard geometry information for incorrect ise size
+ 3. Remove unnecessary config reload call
+ 4. Add smack rule for vconf
+ 5. Add msgid for minicontrol
 
 
-ISF 2.4.6429 :
- 1. [immodule] Added autocapital status checking code at focus-in
+ISF 2.4.6507 :
+ 1. [immodule] support autocapital for continuous space
+ 2. [setting] fix isfsetting: hw/sw keyboard setup module issue while hw/sw have the same name
+ 3. [demo] remove code for terminating app when END key is pressed
+ 4. [immodule] fix bug show request was ignored after input panel hide is called but hide state callback wasn't called
+ 5. Set Smack label for supporting OSP IMEs
+ 6. Set default language for isf_get_normalized_language ()
 
 
-ISF 2.4.6427 :
- 1. [immodule] Added layout checking code
- 2. [panel] Added SIGABRT signal handler
+ISF 2.4.6502 :
+ 1. [immodule] use secure log
+ 2. [panel] Add minicontrol window for keyboard input detection
+ 3. [panel] fix candidate object background highlight size
 
 
-ISF 2.4.6426 :
- 1. [immodule] fix prevent issue
- 2. [immodule] Fix capslock bug in USB keyboard
- 3. [panel] Adjust the rotation angle when ISE delivers its ROT_CHANGE_REQ
+ISF 2.4.6430 :
+ 1. Remove hangul toggle key in config file
+ 2. [panel] change more and close button image when ui_candidate_show called
+ 3. [immodule] Moved the autocapital code to commit_string from process_key
+ 4. [immodule] Added autocapital_type checking code
+ 5. [immodule] fix prevent defect
+ 6. [immodule] Fix capslock bug in USB keyboard
+ 7. [immodule] move autocapital log
+ 8. [panel] Adjust the rotation angle when ISE delivers its ROT_CHANGE_REQ
+ 9. [immodule] Added layout checking code
+10. [setting] change directory ug-isfsetting-efl.xml not to uninstall
+11. [immodule] Fixed the problem that auto capitalization does not work properly when switching applications
 
 
-ISF 2.4.6424 :
- 1. [immodule] Moved the autocapital code to commit_string from process_key
- 2. [immodule] remove code to check lock screen
+ISF 2.4.6429 :
+ 1. [panel] Support Deco Emoji in candidate window
+
+
+ISF 2.4.6425 :
+ 1. [immodule] remove code to check lockscreen
 
 
 ISF 2.4.6423 :
- 1. [immodule] Notify shift mode when shift mode enabled.
+ 1. [demo] change code to process back button
+ 2. update smack rule for xorg
+ 3. hide candidate_area_2 after resize candidate window
+ 4. fix H/W keyboard option menu is enabled even though there is no option module
+ 5. [setting] fix prevent issue
+ 6. [immodule] fix crash issue if cursor position value is more than the length of surrounding text
+ 7. Modified to update rotation angle when keyboard window is fully visible
+ 8. Notify shift mode when shift mode enabled
+
+
+ISF 2.4.6418 :
+ 1. [immodule] fix autoperiod bug
 
 
 ISF 2.4.6417 :
@@ -414,11 +755,8 @@ ISF 2.4.6409 :
 
 
 ISF 2.4.6408 :
- 1. fix symbolic link for isfsetting ug
-
-
-ISF 2.4.6406 :
  1. [immodule] Added extra will_show timer deletion code
+ 2. fix symbolic link for isfsetting ug
 
 
 ISF 2.4.6405 :
@@ -434,21 +772,19 @@ ISF 2.4.6404 :
 
 
 ISF 2.4.6403 :
- 1. Fix defects according to prevent report
- 2. [setting] separate ug package to support osp setting
-
-
-ISF 2.4.6401 :
- 1. [immodule] support layout variation
- 2. [demo] Add demo for a variety of layout variations
+ 1. Fix socket read timeout
+ 2. [panel] fix rotation error of candidate
  3. [setting] item should not be highlighted on dragging
- 4. [immodule] avoid to send focus-in in the input panel disabled context
+ 4. Fix defects according to prevent report
+ 5. [setting] separate ug package to support osp setting
+ 6. [immodule] avoid to send focus-in in the input panel disabled context
+ 7. Fix autocapital defect
 
 
-ISF 2.4.6329 :
+ISF 2.4.6328 :
  1. [immodule] reset input panel state if state callback will not be called in 5 seconds
- 2. [panel] fix rotation error of candidate window
- 3. Fix socket read timeout
+ 2. [immodule] support layout variation
+ 3. [demo] Add demo for a variety of layout variations
 
 
 ISF 2.4.6326 :
@@ -504,6 +840,7 @@ ISF 2.4.6306 :
 
 ISF 2.4.6228 :
  1. [panel] Add monitor for active ISE file
+ 2. [isfcontrol] Update control APIs for C application
 
 
 ISF 2.4.6227 :
@@ -555,6 +892,7 @@ ISF 2.4.6207 :
 
 ISF 2.4.6205 :
  1. Launch initial ISE when active soft ISE is removed
+ 2. fix bug wrong hide context is delivered.
 
 
 ISF 2.4.6202 :
@@ -562,8 +900,10 @@ ISF 2.4.6202 :
 
 
 ISF 2.3.6131 :
- 1. [panel] fix logic to create control window
- 2. [immodule] fix bug preedit doesn't appear sometimes
+ 1. [immodule] Remove code to hide IME in case of Search, Go, so on return key type
+ 2. [panel] fix logic to create control window
+ 3. update isf.manifest for SMACK
+ 4. [immodule] fix bug preedit doesn't appear sometimes
 
 
 ISF 2.3.6130 :
index 22003a3..3b8a845 100644 (file)
@@ -1,15 +1,12 @@
 [Unit]
 Description=Start the input service framework panel
-After=ac.service
-Requires=ac.service
+After=e17.service
 
 [Service]
 ExecStart=/usr/bin/scim
-Environment=HOME=/root
-EnvironmentFile=/etc/sysconfig/tizen-mobile-ui
 Nice=5
 Restart=always
 RestartSec=2
 
 [Install]
-WantedBy=graphical.target
+WantedBy=core-efl.target
diff --git a/ug-isfsetting-efl.xml b/ug-isfsetting-efl.xml
deleted file mode 100644 (file)
index 8b53ad1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="ug-isfsetting-efl" version="0.1" install-location="internal-only">
-        <label>Keyboard setting</label>
-        <author email="shuo0805.liu@samsung.com" href="www.samsung.com">Shuo Liu</author>
-        <description>Keyboard setting Application</description>
-        <ui-application appid="isfsetting-efl" exec="/opt/ug/bin/isfsetting-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
-                <icon>ug-isfsetting-efl.png</icon>
-                <label>Keyboard setting Appcontrol</label>
-                <label xml:lang="en-us">Keyboard setting</label>
-                <application-service>
-                    <operation name="http://tizen.org/appcontrol/operation/setting/ime"/>
-                </application-service>
-       </ui-application>
-</manifest>