Fix make distcheck errors.HEADmaster

8 files changed, 375 insertions, 329 deletions

diff --git a/bus/Makefile.am b/bus/Makefile.am
index c9244f3..d1d16d4 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -103,7 +103,11 @@ test_matchrule_SOURCES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	ibus.desktop \
+	$(desktop_in_files) \
+	$(NULL)
+
+DISTCLEANFILES = \
+	$(desktop_DATA) \
 	$(NULL)
 
 $(libibus):
diff --git a/data/Makefile.am b/data/Makefile.am
index 68e52ec..32854e1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = \
 
 
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = ibus.schemas
+schemas_in_files = ibus.schemas.in
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -40,5 +40,9 @@ if GCONF_SCHEMAS_INSTALL
 endif
 
 EXTRA_DIST = \
+	$(schemas_in_files) \
+	$(NULL)
+
+DISTCLEANFILES = \
 	$(schemas_DATA) \
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b30bdf..064ceba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,37 +1,55 @@
-./ibus/bus.py
-./ibus/__init__.py
-./ibus/common.py
-./ibus/utility.py
-./ibus/keysyms.py
-./ibus/modifier.py
-./ibus/attribute.py
-./ibus/engine.py
-./ibus/panel.py
-./ibus/interface/__init__.py
-./ibus/interface/ipanel.py
-./ibus/interface/iconfig.py
-./ibus/interface/iibus.py
-./ibus/interface/iengine.py
-./ibus/interface/ienginefactory.py
-./ibus/exception.py
-./ibus/application.py
-./ibus/object.py
-./ibus/lang.py
-./ibus/lookuptable.py
-./ibus/property.py
-./ibus/_gtk.py
-./ibus/ascii.py
-./ibus/factory.py
-./ui/gtk/menu.py
-./ui/gtk/handle.py
-./ui/gtk/icon.py
-./ui/gtk/candidatepanel.py
-./ui/gtk/toolitem.py
-./ui/gtk/main.py
-./ui/gtk/panel.py
-./ui/gtk/propitem.py
-./ui/gtk/languagebar.py
-./setup/main.py
-./setup/keyboardshortcut.py
-./setup/enginecombobox.py
-./setup/setup.glade
+src/ibusbus.c
+src/ibusconfig.c
+src/ibusconnection.c
+src/ibusengine.c
+src/ibushotkey.c
+src/ibusinputcontext.c
+src/ibusobject.c
+src/ibusproxy.c
+src/ibusserver.c
+src/ibusservice.c
+src/keyname-table.h
+bus/ibus.desktop.in
+bus/dbusimpl.c
+bus/engineproxy.c
+bus/inputcontext.c
+bus/panelproxy.c
+ibus/bus.py
+ibus/__init__.py
+ibus/common.py
+ibus/utility.py
+ibus/keysyms.py
+ibus/modifier.py
+ibus/attribute.py
+ibus/engine.py
+ibus/panel.py
+ibus/interface/__init__.py
+ibus/interface/ipanel.py
+ibus/interface/iconfig.py
+ibus/interface/iibus.py
+ibus/interface/iengine.py
+ibus/interface/ienginefactory.py
+ibus/exception.py
+ibus/application.py
+ibus/object.py
+ibus/lang.py
+ibus/lookuptable.py
+ibus/property.py
+ibus/_gtk.py
+ibus/ascii.py
+ibus/factory.py
+ui/gtk/menu.py
+ui/gtk/handle.py
+ui/gtk/icon.py
+ui/gtk/candidatepanel.py
+ui/gtk/toolitem.py
+ui/gtk/main.py
+ui/gtk/panel.py
+ui/gtk/propitem.py
+ui/gtk/languagebar.py
+setup/main.py
+setup/keyboardshortcut.py
+setup/enginecombobox.py
+setup/setup.glade
+setup/ibus-setup.desktop.in
+data/ibus.schemas.in
diff --git a/po/fr.po b/po/fr.po
index 001881f..fded71d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 17:12+0800\n"
+"POT-Creation-Date: 2009-03-31 10:27+0800\n"
 "PO-Revision-Date: 2009-03-11 17:30+0100\n"
 "Last-Translator: Julroy67 <julroy67@gmail.com>\n"
 "Language-Team: French <julroy67@gmail.com>\n"
@@ -18,77 +18,6 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: .././data/ibus.schemas.in.h:1
-msgid "Auto Hide"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:2
-#, fuzzy
-msgid "Custom Font"
-msgstr "Police personnalisée :"
-
-#: .././data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:4
-#, fuzzy
-msgid "Next Engine Hotkey"
-msgstr "moteur suivant"
-
-#: .././data/ibus.schemas.in.h:5
-msgid "Next engine hotkey for switch to next input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:6
-msgid "Orientation of Lookup Table"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:7
-msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Preload Engines"
-msgstr "moteur précédent"
-
-#: .././data/ibus.schemas.in.h:9
-msgid "Preload Engines during ibus starts up"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:10
-#, fuzzy
-msgid "Prev Engine Hotkey"
-msgstr "moteur précédent"
-
-#: .././data/ibus.schemas.in.h:11
-msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:12
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:13
-msgid "Trigger Hotkey"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:14
-msgid "Trigger hotkey for enable or disable input context"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:15
-#, fuzzy
-msgid "Use Custom Font"
-msgstr "Utiliser une police personnalisée"
-
-#: .././data/ibus.schemas.in.h:16
-msgid "Use custom font name for language panel"
-msgstr ""
-
 #: .././ibus/lang.py:40 .././ui/gtk/panel.py:307 .././ui/gtk/panel.py:308
 #: .././ui/gtk/panel.py:309 .././ui/gtk/panel.py:310
 msgid "Other"
@@ -280,3 +209,78 @@ msgstr "Utiliser une police personnalisée"
 #: .././setup/setup.glade.h:28
 msgid "previous input method:"
 msgstr "méthode d'entrée précédente :"
+
+#: .././data/ibus.schemas.in.h:1
+msgid "Auto Hide"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:2
+#, fuzzy
+msgid "Custom Font"
+msgstr "Police personnalisée :"
+
+#: .././data/ibus.schemas.in.h:3
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:4
+#, fuzzy
+msgid "Next Engine Hotkey"
+msgstr "moteur suivant"
+
+#: .././data/ibus.schemas.in.h:5
+msgid "Next engine hotkey for switch to next input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:6
+msgid "Orientation of Lookup Table"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:7
+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:8
+#, fuzzy
+msgid "Preload Engines"
+msgstr "moteur précédent"
+
+#: .././data/ibus.schemas.in.h:9
+msgid "Preload Engines during ibus starts up"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:10
+#, fuzzy
+msgid "Prev Engine Hotkey"
+msgstr "moteur précédent"
+
+#: .././data/ibus.schemas.in.h:11
+msgid "Prev engine hotkey for switch to previous input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:12
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:13
+msgid "Trigger Hotkey"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:14
+msgid "Trigger hotkey for enable or disable input context"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:15
+#, fuzzy
+msgid "Use Custom Font"
+msgstr "Utiliser une police personnalisée"
+
+#: .././data/ibus.schemas.in.h:16
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index e7581cd..97a02ac 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 17:12+0800\n"
+"POT-Creation-Date: 2009-03-31 10:27+0800\n"
 "PO-Revision-Date: 2009-03-19 16:12+0900\n"
 "Last-Translator: IWAI, Masaharu <iwai@alib.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,77 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././data/ibus.schemas.in.h:1
-msgid "Auto Hide"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:2
-#, fuzzy
-msgid "Custom Font"
-msgstr "カスタムフォント:"
-
-#: .././data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:4
-#, fuzzy
-msgid "Next Engine Hotkey"
-msgstr "次のエンジン"
-
-#: .././data/ibus.schemas.in.h:5
-msgid "Next engine hotkey for switch to next input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:6
-msgid "Orientation of Lookup Table"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:7
-msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Preload Engines"
-msgstr "前のエンジン"
-
-#: .././data/ibus.schemas.in.h:9
-msgid "Preload Engines during ibus starts up"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:10
-#, fuzzy
-msgid "Prev Engine Hotkey"
-msgstr "前のエンジン"
-
-#: .././data/ibus.schemas.in.h:11
-msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:12
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:13
-msgid "Trigger Hotkey"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:14
-msgid "Trigger hotkey for enable or disable input context"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:15
-#, fuzzy
-msgid "Use Custom Font"
-msgstr "カスタムフォントを使う"
-
-#: .././data/ibus.schemas.in.h:16
-msgid "Use custom font name for language panel"
-msgstr ""
-
 #: .././ibus/lang.py:40 .././ui/gtk/panel.py:307 .././ui/gtk/panel.py:308
 #: .././ui/gtk/panel.py:309 .././ui/gtk/panel.py:310
 msgid "Other"
@@ -279,3 +208,78 @@ msgstr "カスタムフォントを使う"
 #: .././setup/setup.glade.h:28
 msgid "previous input method:"
 msgstr "ひとつ前のインプットメソッド:"
+
+#: .././data/ibus.schemas.in.h:1
+msgid "Auto Hide"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:2
+#, fuzzy
+msgid "Custom Font"
+msgstr "カスタムフォント:"
+
+#: .././data/ibus.schemas.in.h:3
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:4
+#, fuzzy
+msgid "Next Engine Hotkey"
+msgstr "次のエンジン"
+
+#: .././data/ibus.schemas.in.h:5
+msgid "Next engine hotkey for switch to next input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:6
+msgid "Orientation of Lookup Table"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:7
+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:8
+#, fuzzy
+msgid "Preload Engines"
+msgstr "前のエンジン"
+
+#: .././data/ibus.schemas.in.h:9
+msgid "Preload Engines during ibus starts up"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:10
+#, fuzzy
+msgid "Prev Engine Hotkey"
+msgstr "前のエンジン"
+
+#: .././data/ibus.schemas.in.h:11
+msgid "Prev engine hotkey for switch to previous input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:12
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:13
+msgid "Trigger Hotkey"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:14
+msgid "Trigger hotkey for enable or disable input context"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:15
+#, fuzzy
+msgid "Use Custom Font"
+msgstr "カスタムフォントを使う"
+
+#: .././data/ibus.schemas.in.h:16
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr ""
diff --git a/po/pa.po b/po/pa.po
index fa803c9..3f6ee84 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 17:12+0800\n"
+"POT-Creation-Date: 2009-03-31 10:27+0800\n"
 "PO-Revision-Date: 2008-10-17 14:15+0530\n"
 "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
@@ -16,78 +16,6 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: .././data/ibus.schemas.in.h:1
-msgid "Auto Hide"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:2
-#, fuzzy
-msgid "Custom Font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
-
-#: .././data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:4
-#, fuzzy
-msgid "Next Engine Hotkey"
-msgstr "ਅਗਲਾ ਇੰਜਣ"
-
-#: .././data/ibus.schemas.in.h:5
-msgid "Next engine hotkey for switch to next input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:6
-msgid "Orientation of Lookup Table"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:7
-msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Preload Engines"
-msgstr "ਪ੍ਰੀ-ਲੋਡ"
-
-#: .././data/ibus.schemas.in.h:9
-msgid "Preload Engines during ibus starts up"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:10
-#, fuzzy
-msgid "Prev Engine Hotkey"
-msgstr "ਪਿਛਲਾ ਇੰਜਣ"
-
-#: .././data/ibus.schemas.in.h:11
-msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:12
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:13
-#, fuzzy
-msgid "Trigger Hotkey"
-msgstr "ਟਰਿੱਗਰ:"
-
-#: .././data/ibus.schemas.in.h:14
-msgid "Trigger hotkey for enable or disable input context"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:15
-#, fuzzy
-msgid "Use Custom Font"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
-
-#: .././data/ibus.schemas.in.h:16
-msgid "Use custom font name for language panel"
-msgstr ""
-
 #: .././ibus/lang.py:40 .././ui/gtk/panel.py:307 .././ui/gtk/panel.py:308
 #: .././ui/gtk/panel.py:309 .././ui/gtk/panel.py:310
 msgid "Other"
@@ -280,6 +208,82 @@ msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 msgid "previous input method:"
 msgstr ""
 
+#: .././data/ibus.schemas.in.h:1
+msgid "Auto Hide"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:2
+#, fuzzy
+msgid "Custom Font"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+
+#: .././data/ibus.schemas.in.h:3
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:4
+#, fuzzy
+msgid "Next Engine Hotkey"
+msgstr "ਅਗਲਾ ਇੰਜਣ"
+
+#: .././data/ibus.schemas.in.h:5
+msgid "Next engine hotkey for switch to next input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:6
+msgid "Orientation of Lookup Table"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:7
+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:8
+#, fuzzy
+msgid "Preload Engines"
+msgstr "ਪ੍ਰੀ-ਲੋਡ"
+
+#: .././data/ibus.schemas.in.h:9
+msgid "Preload Engines during ibus starts up"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:10
+#, fuzzy
+msgid "Prev Engine Hotkey"
+msgstr "ਪਿਛਲਾ ਇੰਜਣ"
+
+#: .././data/ibus.schemas.in.h:11
+msgid "Prev engine hotkey for switch to previous input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:12
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:13
+#, fuzzy
+msgid "Trigger Hotkey"
+msgstr "ਟਰਿੱਗਰ:"
+
+#: .././data/ibus.schemas.in.h:14
+msgid "Trigger hotkey for enable or disable input context"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:15
+#, fuzzy
+msgid "Use Custom Font"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+
+#: .././data/ibus.schemas.in.h:16
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Previous IME:"
 #~ msgstr "ਪਿਛਲਾ ਇੰਜਣ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f27487e..d9649bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 17:12+0800\n"
+"POT-Creation-Date: 2009-03-31 10:27+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -16,77 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: .././data/ibus.schemas.in.h:1
-msgid "Auto Hide"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:2
-#, fuzzy
-msgid "Custom Font"
-msgstr "自定义字体:"
-
-#: .././data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:4
-#, fuzzy
-msgid "Next Engine Hotkey"
-msgstr "下一个引擎"
-
-#: .././data/ibus.schemas.in.h:5
-msgid "Next engine hotkey for switch to next input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:6
-msgid "Orientation of Lookup Table"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:7
-msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Preload Engines"
-msgstr "上一个引擎"
-
-#: .././data/ibus.schemas.in.h:9
-msgid "Preload Engines during ibus starts up"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:10
-#, fuzzy
-msgid "Prev Engine Hotkey"
-msgstr "上一个引擎"
-
-#: .././data/ibus.schemas.in.h:11
-msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:12
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:13
-msgid "Trigger Hotkey"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:14
-msgid "Trigger hotkey for enable or disable input context"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:15
-#, fuzzy
-msgid "Use Custom Font"
-msgstr "使用自定义字体"
-
-#: .././data/ibus.schemas.in.h:16
-msgid "Use custom font name for language panel"
-msgstr ""
-
 #: .././ibus/lang.py:40 .././ui/gtk/panel.py:307 .././ui/gtk/panel.py:308
 #: .././ui/gtk/panel.py:309 .././ui/gtk/panel.py:310
 msgid "Other"
@@ -270,3 +199,78 @@ msgstr "使用自定义字体"
 #: .././setup/setup.glade.h:28
 msgid "previous input method:"
 msgstr "前一入法"
+
+#: .././data/ibus.schemas.in.h:1
+msgid "Auto Hide"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:2
+#, fuzzy
+msgid "Custom Font"
+msgstr "自定义字体:"
+
+#: .././data/ibus.schemas.in.h:3
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:4
+#, fuzzy
+msgid "Next Engine Hotkey"
+msgstr "下一个引擎"
+
+#: .././data/ibus.schemas.in.h:5
+msgid "Next engine hotkey for switch to next input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:6
+msgid "Orientation of Lookup Table"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:7
+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:8
+#, fuzzy
+msgid "Preload Engines"
+msgstr "上一个引擎"
+
+#: .././data/ibus.schemas.in.h:9
+msgid "Preload Engines during ibus starts up"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:10
+#, fuzzy
+msgid "Prev Engine Hotkey"
+msgstr "上一个引擎"
+
+#: .././data/ibus.schemas.in.h:11
+msgid "Prev engine hotkey for switch to previous input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:12
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:13
+msgid "Trigger Hotkey"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:14
+msgid "Trigger hotkey for enable or disable input context"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:15
+#, fuzzy
+msgid "Use Custom Font"
+msgstr "使用自定义字体"
+
+#: .././data/ibus.schemas.in.h:16
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr ""
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 93781ea..83f1ae8 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -46,8 +46,12 @@ CLEANFILES = \
 
 EXTRA_DIST = \
 	ibus-setup.in \
-	ibus-setup.desktop \
 	setup.glade \
+	$(desktop_in_files) \
+	$(NULL)
+
+DISTCLEANFILES = \
+	$(desktop_DATA) \
 	$(NULL)
 
 test: