Localize desktop files and gconf schemas file.

8 files changed, 40 insertions, 25 deletions

diff --git a/autogen.sh b/autogen.sh
index addc0bd..5dfa50c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,7 @@ set -e
 set -x
 
 autopoint  --force || exit 1
+intltoolize --copy --force || exit 1
 libtoolize --automake --copy --force || exit 1
 gtkdocize  --copy || exit 1 #--flavour=no-tmpl
 aclocal -I m4 --force || exit 1
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 1b57a07..c9244f3 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -47,10 +47,11 @@ xdgautostart_DATA = \
 	ibus.desktop \
 	$(NULL)
 xdgautostartdir = $(sysconfdir)/xdg/autostart
-desktop_DATA = \
-	ibus.desktop \
-	$(NULL)
+
 desktopdir = $(datadir)/applications
+desktop_in_files = ibus.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
 noinst_PROGRAMS = $(TESTS)
 bin_PROGRAMS = ibus-daemon
diff --git a/bus/ibus.desktop b/bus/ibus.desktop.in
index 6336dfd..6336dfd 100644
--- a/bus/ibus.desktop
+++ b/bus/ibus.desktop.in
diff --git a/configure.ac b/configure.ac
index 263b83f..614932e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,7 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 if test x"$GCONFTOOL" = xno; then
     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
 fi
+IT_PROG_INTLTOOL([0.40.0])
 
 AM_GCONF_SOURCE_2
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 2200245..68e52ec 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,10 +23,11 @@ SUBDIRS = \
 	icons \
 	$(NULL)
 
-schemas_DATA = \
-	ibus.schemas \
-	$(NULL)
+
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = ibus.schemas
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
diff --git a/data/ibus.schemas b/data/ibus.schemas.in
index 9cfbb47..0eb9676 100644
--- a/data/ibus.schemas
+++ b/data/ibus.schemas.in
@@ -8,8 +8,8 @@
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-      	<short>Preload Engines</short>
-	<long>Preload Engines during ibus starts up</long>
+        <short>Preload Engines</short>
+	    <long>Preload Engines during ibus starts up</long>
       </locale>
     </schema>
     <schema>
@@ -18,11 +18,17 @@
       <owner>ibus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[Control+space]</default>
       <locale name="C">
-      	<short>Trigger Hotkey</short>
-	<long>Trigger hotkey for enable or disable input context</long>
+        <default>[Control+space]</default>
+        <short>Trigger Hotkey</short>
+	    <long>Trigger hotkey for enable or disable input context</long>
       </locale>
+      <locale name="ja">
+        <default>[Zenkaku_Hankaku]</default>
+	  </locale>
+      <locale name="ko">
+        <default>[Hangul,Alt+space]</default>
+	  </locale>
     </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/hotkey/next_engine</key>
@@ -32,8 +38,8 @@
       <list_type>string</list_type>
       <default>[]</default>
       <locale name="C">
-      	<short>Next Engine Hotkey</short>
-	<long>Next engine hotkey for switch to next input method engine</long>
+        <short>Next Engine Hotkey</short>
+	    <long>Next engine hotkey for switch to next input method engine</long>
       </locale>
     </schema>
     <schema>
@@ -44,8 +50,8 @@
       <list_type>string</list_type>
       <default>[]</default>
       <locale name="C">
-      	<short>Prev Engine Hotkey</short>
-	<long>Prev engine hotkey for switch to previous input method engine</long>
+        <short>Prev Engine Hotkey</short>
+	    <long>Prev engine hotkey for switch to previous input method engine</long>
       </locale>
     </schema>
     <schema>
@@ -55,8 +61,8 @@
       <type>int</type>
       <default>1</default>
       <locale name="C">
-      	<short>Auto Hide</short>
-	<long>The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show</long>
+        <short>Auto Hide</short>
+	    <long>The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show</long>
       </locale>
     </schema>
     <schema>
@@ -64,11 +70,14 @@
       <applyto>/desktop/ibus/panel/lookup_table_orientation</applyto>
       <owner>ibus</owner>
       <type>int</type>
-      <default>0</default>
       <locale name="C">
-      	<short>Orientation of Lookup Table</short>
-	<long>Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical</long>
+        <default>0</default>
+        <short>Orientation of Lookup Table</short>
+	    <long>Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical</long>
       </locale>
+      <locale name="ja">
+        <default>1</default>
+	  </locale>
     </schema>
     <schema>
       <key>/schemas/desktop/ibus/panel/use_custom_font</key>
@@ -77,8 +86,8 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-      	<short>Use Custom Font</short>
-	<long>Use custom font name for language panel</long>
+        <short>Use Custom Font</short>
+	    <long>Use custom font name for language panel</long>
       </locale>
     </schema>
     <schema>
@@ -88,8 +97,8 @@
       <type>string</type>
       <default>Sans 10</default>
       <locale name="C">
-      	<short>Custom Font</short>
-	<long>Custom font name for language panel</long>
+        <short>Custom Font</short>
+	    <long>Custom font name for language panel</long>
       </locale>
     </schema>
   </schemalist>
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 65cfdab..93781ea 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -34,8 +34,10 @@ ibussetup_DATA = \
 bin_SCRIPTS = ibus-setup
 ibussetupdir = $(pkgdatadir)/setup
 
-desktop_DATA = ibus-setup.desktop
 desktopdir = $(datadir)/applications
+desktop_in_files = ibus-setup.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
 CLEANFILES = \
 	*.pyc \
diff --git a/setup/ibus-setup.desktop b/setup/ibus-setup.desktop.in
index 673a830..673a830 100644
--- a/setup/ibus-setup.desktop
+++ b/setup/ibus-setup.desktop.in