diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c541b..b59efc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,15 +3,11 @@ cmake_minimum_required(VERSION 2.6)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(Gettext REQUIRED)
-FIND_PACKAGE(Fcitx  4.2.0 REQUIRED)
+FIND_PACKAGE(Fcitx  4.2.7 REQUIRED)
 FIND_PACKAGE(Googlepinyin REQUIRED)
 FIND_PACKAGE(Libintl REQUIRED)
 FIND_PACKAGE(Libiconv REQUIRED)
 
-string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" FCITX4_MAJOR_VERSION "${FCITX4_VERSION}")
-string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" FCITX4_MINOR_VERSION "${FCITX4_VERSION}")
-string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" FCITX4_PATCH_VERSION "${FCITX4_VERSION}")
-
 # uninstall target
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
@@ -21,26 +17,13 @@ configure_file(
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
-if(NOT DEFINED LIB_INSTALL_DIR)
-    set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-
 include(FindPkgConfig)
-
-set(prefix      ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(bindir ${prefix}/bin)
-set(libdir ${LIB_INSTALL_DIR})
-set(localedir ${CMAKE_INSTALL_PREFIX}/share/locale)
-set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
 set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
 configure_file(config.h.in config.h)
 
-set(libdir ${LIB_INSTALL_DIR})
-
+add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(data)
-add_subdirectory(po)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 7ac6c7d..49a77c7 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,3 @@
-fcitx_add_addon_conf_file(fcitx-googlepinyin.conf)
-fcitx_add_inputmethod_conf_file(googlepinyin.conf)
-
 install(FILES googlepinyin.png RENAME fcitx-googlepinyin.png DESTINATION share/icons/hicolor/48x48/apps)
 install(FILES googlepinyin-16.png RENAME fcitx-googlepinyin.png DESTINATION share/icons/hicolor/16x16/apps)
 install(FILES googlepinyin.png DESTINATION share/fcitx/imicon RENAME googlepinyin.png)
diff --git a/debian/changelog b/debian/changelog
index 658367e..a416d16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fcitx-googlepinyin (0.1.6+git20170914.1fa9308-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 06 Aug 2019 23:04:02 +0000
+
 fcitx-googlepinyin (0.1.6-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a61e3de..9fe000f 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,22 +1,7 @@
-file(GLOB PO_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po)
-file(RELATIVE_PATH REL_SOURCE_ROOT ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
-if ("${REL_SOURCE_ROOT}" STREQUAL "")
-    set(REL_SOURCE_ROOT ".")
-endif("${REL_SOURCE_ROOT}" STREQUAL "")
-
-set(POT_FILE fcitx-googlepinyin.pot)
-
-configure_file(POTFILES.in.in ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in)
-
-extract_fcitx_addon_conf_postring()
-
-add_custom_target(
-    pot
-    COMMAND INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} srcdir=${CMAKE_CURRENT_BINARY_DIR} ${INTLTOOL_UPDATE} --gettext-package fcitx-googlepinyin --pot
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/conf.po
-    )
-
-# Update .po files and compile them to binary .gmo files
-gettext_create_translations(${POT_FILE} ALL ${PO_FILES})
+file(GLOB PO_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.po)
 
+foreach(po_file ${PO_FILES})
+  string(REPLACE ".po" "" po_lang "${po_file}")
+  fcitx_translate_add_po_file("${po_lang}" "${po_file}")
+endforeach()
+fcitx_translate_set_pot_target(pot fcitx-googlepinyin fcitx-googlepinyin.pot)
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..152865e
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Walter Garcia-Fontes <walter.garcia@upf.edu>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2013-06-04 11:24-0400\n"
+"PO-Revision-Date: 2016-12-20 07:48+0000\n"
+"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
+"Language-Team: Catalan (http://www.transifex.com/fcitx/fcitx/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/eim.cpp:489 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Pinyin de Google"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Contenidor de pinyin de Google a l'Android"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..d61f566
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# scootergrisen, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2013-06-04 11:24-0400\n"
+"PO-Revision-Date: 2017-09-02 18:28+0000\n"
+"Last-Translator: scootergrisen\n"
+"Language-Team: Danish (http://www.transifex.com/fcitx/fcitx/language/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/eim.cpp:489 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Wrapper af Google Pinyin på Android"
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..a2c310b
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mar well <m.wellendorf@gmx.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2015-08-03 18:01+0200\n"
+"PO-Revision-Date: 2013-05-22 06:03+0000\n"
+"Last-Translator: mar well <m.wellendorf@gmx.de>\n"
+"Language-Team: German (http://www.transifex.com/fcitx/fcitx/language/de/)\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Wrapper von Google Pinyin für Android"
diff --git a/po/fcitx-googlepinyin.pot b/po/fcitx-googlepinyin.pot
index 446ee4e..98eedf2 100644
--- a/po/fcitx-googlepinyin.pot
+++ b/po/fcitx-googlepinyin.pot
@@ -7,21 +7,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-03 09:54+0800\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2013-06-04 11:24-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"
+"Language: LANG\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:1
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/../..//src/eim.cpp:485
+#: src/eim.cpp:489 src/fcitx-googlepinyin.conf.in:3
 msgid "Google Pinyin"
 msgstr ""
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:2
+#: src/fcitx-googlepinyin.conf.in:4
 msgid "Wrapper of Google Pinyin on Android"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..0ca2f3e
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# しろう <>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2015-08-03 18:01+0200\n"
+"PO-Revision-Date: 2013-04-19 20:32+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/fcitx/fcitx/language/ja/)\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Androidで動くGoogle Pinyinのラッパーです"
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..7b09180
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Bon Keun Seo <scobyseo@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2013-06-04 11:24-0400\n"
+"PO-Revision-Date: 2017-07-08 12:06+0000\n"
+"Last-Translator: Bon Keun Seo <scobyseo@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/fcitx/fcitx/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/eim.cpp:489 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "구글 병음입력"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "안드로이드용 구글 병음입력 표지"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..9e147d8
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# TotalCaesar659 <x24cm5b8c54q6szxw@yandex.ru>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2017-09-14 16:03-0700\n"
+"PO-Revision-Date: 2017-08-03 16:57+0000\n"
+"Last-Translator: TotalCaesar659 <x24cm5b8c54q6szxw@yandex.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/fcitx/fcitx/language/ru/)\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Обертка Google Pinyin для Android"
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..137f0b4
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gökhan Kalayci <gkmediagokhan@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2013-06-04 11:24-0400\n"
+"PO-Revision-Date: 2017-04-20 20:35+0000\n"
+"Last-Translator: Gökhan Kalayci <gkmediagokhan@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/fcitx/fcitx/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/eim.cpp:489 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Android'de Google Pinyin'in Wrapper'ı"
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..6188663
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Thu Hoai <contact@bizover.net>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: fcitx\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2015-12-11 23:17-0800\n"
+"PO-Revision-Date: 2013-07-30 14:55+0000\n"
+"Last-Translator: Thu Hoai <contact@bizover.net>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/fcitx/fcitx/language/"
+"vi/)\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
+msgid "Google Pinyin"
+msgstr "Google Pinyin"
+
+#: src/fcitx-googlepinyin.conf.in:4
+msgid "Wrapper of Google Pinyin on Android"
+msgstr "Bộ Google Pinyin trên Android"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ce3db61..51241b1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,33 +3,26 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# , 2011.
+# , 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-03 09:54+0800\n"
-"PO-Revision-Date: 2011-11-16 06:56+0000\n"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2015-12-11 23:17-0800\n"
+"PO-Revision-Date: 2013-04-19 20:32+0000\n"
 "Last-Translator: csslayer <wengxt@gmail.com>\n"
-"Language-Team: Chinese (China) <fcitx-dev@googlegroups.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/fcitx/fcitx/"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:1
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/../..//src/eim.cpp:485
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
 msgid "Google Pinyin"
 msgstr "Google 拼音"
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:2
+#: src/fcitx-googlepinyin.conf.in:4
 msgid "Wrapper of Google Pinyin on Android"
 msgstr "Android 上的 Google 拼音的封装"
-
-# unknown
-#~ msgid "GooglePinyin"
-#~ msgstr "Google 拼音"
-
-#~ msgid "Priority of GooglePinyin"
-#~ msgstr "Google 拼音的优先级"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 18bca65..1132f52 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,34 +3,26 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Alisha <alisha.4m@gmail.com>, 2012.
+# Alisha <alisha.4m@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: fcitx\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-03 09:54+0800\n"
-"PO-Revision-Date: 2012-01-26 16:06+0000\n"
-"Last-Translator: Alisha <alisha.4m@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/fcitx/"
+"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n"
+"POT-Creation-Date: 2015-12-11 23:17-0800\n"
+"PO-Revision-Date: 2013-04-19 20:32+0000\n"
+"Last-Translator: csslayer <wengxt@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/fcitx/fcitx/"
 "language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:1
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/../..//src/eim.cpp:485
+#: src/eim.cpp:490 src/fcitx-googlepinyin.conf.in:3
 msgid "Google Pinyin"
 msgstr "Google 拼音"
 
-#: /home/saber/Develop/fcitx-googlepinyin/build/po/tmp/fcitx-googlepinyin.conf.in.h:2
+#: src/fcitx-googlepinyin.conf.in:4
 msgid "Wrapper of Google Pinyin on Android"
 msgstr "Android 上的 Google 拼音的封裝"
-
-# unknown
-#~ msgid "GooglePinyin"
-#~ msgstr "Google 拼音"
-
-#~ msgid "Priority of GooglePinyin"
-#~ msgstr "Google 拼音優先權"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93700c6..9fa99ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,9 +12,8 @@ include_directories(
     ${FCITX4_FCITX_UTILS_INCLUDE_DIRS}
 )
 
-fcitx_add_addon(fcitx-googlepinyin ${FCITX_GOOGLEPINYIN_SRCS})
-target_link_libraries(fcitx-googlepinyin
-                      ${GOOGLEPINYIN_LIBRARIES}
-                      ${LIBICONV_LIBRARIES}
-                      ${LIBINTL_LIBRARIES}
-                      )
+fcitx_add_addon_full(googlepinyin
+  SOURCES ${FCITX_GOOGLEPINYIN_SRCS}
+  LINK_LIBS ${GOOGLEPINYIN_LIBRARIES}
+            ${LIBICONV_LIBRARIES}
+            ${LIBINTL_LIBRARIES})
diff --git a/src/eim.cpp b/src/eim.cpp
index 5c343a7..94a51b5 100644
--- a/src/eim.cpp
+++ b/src/eim.cpp
@@ -439,6 +439,7 @@ void* FcitxGooglePinyinCreate (FcitxInstance* instance)
 {
     FcitxGooglePinyin* googlepinyin = (FcitxGooglePinyin*) fcitx_utils_malloc0(sizeof(FcitxGooglePinyin));
     bindtextdomain("fcitx-googlepinyin", LOCALEDIR);
+    bind_textdomain_codeset("fcitx-googlepinyin", "UTF-8");
     char* userDict = NULL;
     googlepinyin->owner = instance;
 
@@ -463,14 +464,11 @@ void* FcitxGooglePinyinCreate (FcitxInstance* instance)
 
 
     char* syspath = NULL;
-#if FCITX_CHECK_VERSION(4,2,1)
     /* portable detect here */
     if (getenv("FCITXDIR")) {
-        syspath = fcitx_utils_get_fcitx_path_with_filename("libdir", "sunpinyin/data");
+        syspath = fcitx_utils_get_fcitx_path_with_filename("libdir", "googlepinyin/data");
     }
-    else 
-#endif
-    {
+    else {
         syspath = strdup(GOOGLEPINYIN_LIBDIR "/googlepinyin/data/dict_pinyin.dat");
     }
     bool result = ime_pinyin::im_open_decoder(syspath, userDict);
diff --git a/data/fcitx-googlepinyin.conf.in b/src/fcitx-googlepinyin.conf.in
similarity index 100%
rename from data/fcitx-googlepinyin.conf.in
rename to src/fcitx-googlepinyin.conf.in
diff --git a/data/googlepinyin.conf.in b/src/googlepinyin.conf.in
similarity index 100%
rename from data/googlepinyin.conf.in
rename to src/googlepinyin.conf.in