diff --git a/kdialogd3/po/CMakeLists.txt b/kdialogd3/po/CMakeLists.txt
index 3f456de..d0f5baf 100644
--- a/kdialogd3/po/CMakeLists.txt
+++ b/kdialogd3/po/CMakeLists.txt
@@ -1,41 +1,17 @@
-find_package(Msgfmt REQUIRED)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
 
-# .po to .gmo stuff
-file(GLOB _pofiles *.po)
+file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} kgtk.po )
 
-foreach(_file ${_pofiles})
-    get_filename_component(_file_we ${_file} NAME_WE)
-    set(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo")
-    set(_in "${_file_we}.po")
-    add_custom_command(OUTPUT ${_out} COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_file} DEPENDS ${_file})
-    install(FILES ${_out} DESTINATION share/locale/${_file_we}/LC_MESSAGES/ RENAME kdialogd3.mo)
-    set(_outputs ${_outputs} ${_out})
-endforeach(_file)
-
-add_custom_target(pofiles ALL DEPENDS ${_outputs})
-
-# Stuff to generate the .pot
-set(POT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../kdialogd.cpp)
-set(POT_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/kdialogd3.pot)
-
-# Find xgettext
-find_program(XGETTEXT_PATH NAMES "xgettext" PATHS "/usr/bin" "/usr/local/bin")
-if(${XGETTEXT_PATH} STREQUAL "XGETTEXT_PATH-NOTFOUND")
-    message(STATUS "xgettext not found.  You will not be able to run 'make extract_messages' in the 'po' directory.")
-else(${XGETTEXT_PATH} STREQUAL "XGETTEXT_PATH-NOTFOUND")
-    message(STATUS "Found xgettext: ${XGETTEXT_PATH}")
-endif(${XGETTEXT_PATH} STREQUAL "XGETTEXT_PATH-NOTFOUND")
-
-if(EXISTS ${KDE3_INCLUDE_DIR}/kde.pot)
-    add_custom_command(
-        OUTPUT ${POT_OUTPUT}
-        COMMAND ${XGETTEXT_PATH} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x "${KDE3_INCLUDE_DIR}/kde.pot" -o ${POT_OUTPUT} ${POT_SOURCES}
-    )
-else (EXISTS ${KDE3_INCLUDE_DIR}/kde.pot)
-    add_custom_command(
-        OUTPUT ${POT_OUTPUT}
-        COMMAND ${XGETTEXT_PATH} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -o ${POT_OUTPUT} ${POT_SOURCES}
-    )
-endif (EXISTS ${KDE3_INCLUDE_DIR}/kde.pot)
-
-add_custom_target(extract_messages DEPENDS ${POT_OUTPUT})
+foreach( _po ${po_files} )
+  get_filename_component( _lang ${_po} PATH )
+  tde_create_translation( FILES ${_po} LANG ${_lang} )
+endforeach( )
diff --git a/kdialogd3/po/cs.po b/kdialogd3/po/cs/kgtk.po
similarity index 100%
rename from kdialogd3/po/cs.po
rename to kdialogd3/po/cs/kgtk.po
diff --git a/kdialogd3/po/de.po b/kdialogd3/po/de/kgtk.po
similarity index 100%
rename from kdialogd3/po/de.po
rename to kdialogd3/po/de/kgtk.po
diff --git a/kdialogd3/po/en_GB.po b/kdialogd3/po/en_GB/kgtk.po
similarity index 100%
rename from kdialogd3/po/en_GB.po
rename to kdialogd3/po/en_GB/kgtk.po
diff --git a/kdialogd3/po/es.po b/kdialogd3/po/es/kgtk.po
similarity index 100%
rename from kdialogd3/po/es.po
rename to kdialogd3/po/es/kgtk.po
diff --git a/kdialogd3/po/fr.po b/kdialogd3/po/fr/kgtk.po
similarity index 100%
rename from kdialogd3/po/fr.po
rename to kdialogd3/po/fr/kgtk.po
diff --git a/kdialogd3/po/pt_BR.po b/kdialogd3/po/pt_BR/kgtk.po
similarity index 100%
rename from kdialogd3/po/pt_BR.po
rename to kdialogd3/po/pt_BR/kgtk.po
diff --git a/kdialogd3/po/ru.po b/kdialogd3/po/ru/kgtk.po
similarity index 100%
rename from kdialogd3/po/ru.po
rename to kdialogd3/po/ru/kgtk.po
diff --git a/kdialogd3/po/zh_CN.po b/kdialogd3/po/zh_CN/kgtk.po
similarity index 100%
rename from kdialogd3/po/zh_CN.po
rename to kdialogd3/po/zh_CN/kgtk.po