Rename a number of libraries and executables to avoid conflicts with KDE4

223 files changed, 2243 insertions, 2243 deletions

diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-bg/acinclude.m4
+++ b/koffice-i18n-bg/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-bg/messages/koffice/desktop_koffice.po b/koffice-i18n-bg/messages/koffice/desktop_koffice.po
index c50d5982..0f437dd4 100644
--- a/koffice-i18n-bg/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-bg/messages/koffice/desktop_koffice.po
@@ -2146,19 +2146,19 @@ msgstr "Name=Текстов документ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Нов документ на KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Информация за Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Информация за Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Информация за KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Информация за OpenOffice.org"
 
diff --git a/koffice-i18n-bg/messages/koffice/kfile_abiword.po b/koffice-i18n-bg/messages/koffice/tdefile_abiword.po
index 9c8de699..a7baa1b7 100644
--- a/koffice-i18n-bg/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-bg/messages/koffice/tdefile_abiword.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-07-02 14:34+0300\n"
 "Last-Translator: Radostin Radnev <radnev@yahoo.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Информация за документа"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Заглавие"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Резюме"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Неизвестно*"
diff --git a/koffice-i18n-bg/messages/koffice/kfile_gnumeric.po b/koffice-i18n-bg/messages/koffice/tdefile_gnumeric.po
index ed5d3f8e..5d7d4fab 100644
--- a/koffice-i18n-bg/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-bg/messages/koffice/tdefile_gnumeric.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-07-02 14:35+0300\n"
 "Last-Translator: Radostin Radnev <radnev@yahoo.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Информация за документа"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Заглавие"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Резюме"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Неизвестно*"
diff --git a/koffice-i18n-bg/messages/koffice/kfile_koffice.po b/koffice-i18n-bg/messages/koffice/tdefile_koffice.po
index d81e3d6e..aeb72fe1 100644
--- a/koffice-i18n-bg/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-bg/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
 # Bulgarian translation of KDE.
 # This file is licensed under the GPL.
 #
-# $Id: kfile_koffice.po 669926 2007-05-30 20:14:32Z berger $
+# $Id: tdefile_koffice.po 669926 2007-05-30 20:14:32Z berger $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-12-11 20:40+0200\n"
 "Last-Translator: Radostin Radnev <radnev@yahoo.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Информация за документа"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Заглавие"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Резюме"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Неизвестно*"
diff --git a/koffice-i18n-bg/messages/koffice/kfile_ooo.po b/koffice-i18n-bg/messages/koffice/tdefile_ooo.po
index 486c9726..ccd2b646 100644
--- a/koffice-i18n-bg/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-bg/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
 # Bulgarian translation of KDE.
 # This file is licensed under the GPL.
 #
-# $Id: kfile_ooo.po 669926 2007-05-30 20:14:32Z berger $
+# $Id: tdefile_ooo.po 669926 2007-05-30 20:14:32Z berger $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-06-28 23:31+0300\n"
 "Last-Translator: Radostin Radnev <radnev@yahoo.com>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Отпечатано от"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Дата на печат"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Дата"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Дата на създаване"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Създател"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Програма"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Цикли на редактиране"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Време на редактиране"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Заглавие"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Описание"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Тема"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Език"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Скици"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Таблици"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Изображения"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Обекти"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Външни обекти (OLE)"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Страници"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Абзаци"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Думи"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Клетки"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Знаци"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Редове"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Потребителски данни"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Информация за документа"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Ключови думи"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Разширена информация"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Статистика за документа"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ca/acinclude.m4
+++ b/koffice-i18n-ca/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ca/messages/koffice/desktop_koffice.po b/koffice-i18n-ca/messages/koffice/desktop_koffice.po
index 5890830e..3a16f698 100644
--- a/koffice-i18n-ca/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ca/messages/koffice/desktop_koffice.po
@@ -2161,19 +2161,19 @@ msgstr "Name=Document de text..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nou document KWord"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informació Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informació Gnumericc"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informació KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informació OpenOffice.org"
 
diff --git a/koffice-i18n-ca/messages/koffice/kfile_abiword.po b/koffice-i18n-ca/messages/koffice/tdefile_abiword.po
index be9c6d7d..8412c800 100644
--- a/koffice-i18n-ca/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-ca/messages/koffice/tdefile_abiword.po
@@ -1,10 +1,10 @@
-# translation of kfile_abiword.po to Catalan
+# translation of tdefile_abiword.po to Catalan
 # Albert Astals Cid <astals11@terra.es>, 2006.
 # Rafael Carreras <rafael.carreras@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-02-06 10:18+0100\n"
 "Last-Translator: Rafael Carreras <rafael.carreras@gmail.com>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informació del document"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Títol"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resum"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Desconegut*"
diff --git a/koffice-i18n-ca/messages/koffice/kfile_gnumeric.po b/koffice-i18n-ca/messages/koffice/tdefile_gnumeric.po
index d2c9bd58..c259d095 100644
--- a/koffice-i18n-ca/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-ca/messages/koffice/tdefile_gnumeric.po
@@ -1,10 +1,10 @@
-# translation of kfile_gnumeric.po to Catalan
+# translation of tdefile_gnumeric.po to Catalan
 # Albert Astals Cid <astals11@terra.es>, 2006.
 # Rafael Carreras <rafael.carreras@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-02-06 10:18+0100\n"
 "Last-Translator: Rafael Carreras <rafael.carreras@gmail.com>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informació del document"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Títol"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resum"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Desconegut*"
diff --git a/koffice-i18n-ca/messages/koffice/kfile_koffice.po b/koffice-i18n-ca/messages/koffice/tdefile_koffice.po
index 276567c7..f7f40144 100644
--- a/koffice-i18n-ca/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ca/messages/koffice/tdefile_koffice.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-09-29 13:54GMT+1\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informació del document"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Títol"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resum"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Desconegut*"
diff --git a/koffice-i18n-ca/messages/koffice/kfile_ooo.po b/koffice-i18n-ca/messages/koffice/tdefile_ooo.po
index c3cefebf..3c0a3a6b 100644
--- a/koffice-i18n-ca/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ca/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Catalan
+# translation of tdefile_ooo.po to Catalan
 # Albert Astals Cid <astals11@terra.es>, 2003, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-04-12 15:16+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Imprés per"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data d'impressió"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data de creació"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creador"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generador"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cicles d'edició"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Durada de l'edició"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Títol"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descripció"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Assumpte"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Idioma"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Dibuixos"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Taules"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imatges"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objectes"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objectes OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pàgines"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paràgrafs"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Paraules"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cel·les"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caràcters"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Files"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definit per l'usuari"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informació del document"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Paraules clau"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avançat"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Estadistiques del document"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-cs/acinclude.m4
+++ b/koffice-i18n-cs/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-cs/messages/koffice/desktop_koffice.po b/koffice-i18n-cs/messages/koffice/desktop_koffice.po
index ee98b64a..167c694f 100644
--- a/koffice-i18n-cs/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-cs/messages/koffice/desktop_koffice.po
@@ -2366,21 +2366,21 @@ msgstr "Name=Textový dokument"
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nový dokument aplikace KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 #, fuzzy
 msgid "Name=Abiword Info"
 msgstr "Name=KOffice info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 #, fuzzy
 msgid "Name=Gnumeric Info"
 msgstr "Name=KOffice info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org info"
 
diff --git a/koffice-i18n-cs/messages/koffice/kfile_koffice.po b/koffice-i18n-cs/messages/koffice/tdefile_koffice.po
index d90ed3b8..83af5446 100644
--- a/koffice-i18n-cs/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-cs/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Czech
+# translation of tdefile_koffice.po to Czech
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Lukas Tinkl <lukas@kde.org>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-08 15:30+0200\n"
 "Last-Translator: Lukas Tinkl <lukas@kde.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informace o dokumentu"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Název"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Souhrn"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Neznámý*"
diff --git a/koffice-i18n-cs/messages/koffice/kfile_ooo.po b/koffice-i18n-cs/messages/koffice/tdefile_ooo.po
index 4a321f48..53d61b2f 100644
--- a/koffice-i18n-cs/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-cs/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Czech
+# translation of tdefile_ooo.po to Czech
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Lukáš Tinkl <lukas@kde.org>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-06-09 11:21+0200\n"
 "Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Vytisknul"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Datum tisku"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Datum vytvoření"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Vytvořil"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generátor"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cyklů úprav"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Doba trvání úprav"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Název"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Popis"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Předmět"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Jazyk"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Kresby"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabulky"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Obrázky"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekty"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE objekty"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Strany"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Odstavce"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Slova"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Buňky"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Znaky"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Řádky"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definováno uživatelem"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informace o dokumentu"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Klíčová slova"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Pokročilé"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistika dokumentu"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-cy/messages/koffice/desktop_koffice.po b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
index 9da5ade2..020f33d3 100644
--- a/koffice-i18n-cy/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
@@ -2228,19 +2228,19 @@ msgstr "Name=Dogfen Destun..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Dogfen newydd KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Gwybodaeth Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gwybodaeth Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Gwybodaeth KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Gwybodaeth OpenOffice.org"
 
diff --git a/koffice-i18n-cy/messages/koffice/kfile_koffice.po b/koffice-i18n-cy/messages/koffice/tdefile_koffice.po
index 4394ad5f..555b23a8 100644
--- a/koffice-i18n-cy/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-cy/messages/koffice/tdefile_koffice.po
@@ -1,8 +1,8 @@
-# translation of kfile_koffice.po to Cymraeg
+# translation of tdefile_koffice.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2004-06-26 12:24+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Gwybodaeth Ddogfen"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Crynodeb"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Anhysbys*"
diff --git a/koffice-i18n-cy/messages/koffice/kfile_ooo.po b/koffice-i18n-cy/messages/koffice/tdefile_ooo.po
index 5a042a2a..7412fb4a 100644
--- a/koffice-i18n-cy/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-cy/messages/koffice/tdefile_ooo.po
@@ -1,4 +1,4 @@
-# translation of kfile_ooo.po to Cymraeg
+# translation of tdefile_ooo.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-07-05 14:22+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -19,122 +19,122 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Argraffwyd Gan"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Dyddiad Argraffu"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creuwr"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Cynhyrchydd"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cylchredau Golygu"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Cyfnod Golygu"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Iaith"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Darluniadau"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tablau"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Delweddau"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Gwrthrychau"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Gwrthrychau OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraffau"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Geiriau"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celloedd"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Nodau"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rhesi"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Diffiniedig gan y Defnyddiwr "
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Gwybodaeth Ddogfen"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Allweddeiriau"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dogfen Uwch"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Ystadegau Dogfen"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-da/acinclude.m4
+++ b/koffice-i18n-da/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-da/docs/koffice/kivio/working.docbook b/koffice-i18n-da/docs/koffice/kivio/working.docbook
index 305dffe4..4dfa9eb6 100644
--- a/koffice-i18n-da/docs/koffice/kivio/working.docbook
+++ b/koffice-i18n-da/docs/koffice/kivio/working.docbook
@@ -188,7 +188,7 @@
 <title
 >Eksportér en side</title>
 <para
->Enkelte sider kan eksporteres som bitmap-grafikfiler. For at eksportere nuværende side, vælges <menuchoice
+>Enkelte sider kan eksporteres som bitmap-grafitdefiler. For at eksportere nuværende side, vælges <menuchoice
 ><guimenu
 >Fil</guimenu
 > <guimenuitem
diff --git a/koffice-i18n-da/messages/koffice/desktop_koffice.po b/koffice-i18n-da/messages/koffice/desktop_koffice.po
index 72b23b80..4fd83e3a 100644
--- a/koffice-i18n-da/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-da/messages/koffice/desktop_koffice.po
@@ -2151,19 +2151,19 @@ msgstr "Name=Tekstdokument..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nyt KWord-dokument:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-information"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org Info"
 
diff --git a/koffice-i18n-da/messages/koffice/kfile_abiword.po b/koffice-i18n-da/messages/koffice/tdefile_abiword.po
index 828b496a..2185436b 100644
--- a/koffice-i18n-da/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-da/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# Danish translation of kfile_abiword
+# Danish translation of tdefile_abiword
 # Erik Kjær Pedersen <erik@binghamton.edu>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-06-13 08:14+0200\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resumé"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Ukendt*"
diff --git a/koffice-i18n-da/messages/koffice/kfile_gnumeric.po b/koffice-i18n-da/messages/koffice/tdefile_gnumeric.po
index d8f943ad..78433a58 100644
--- a/koffice-i18n-da/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-da/messages/koffice/tdefile_gnumeric.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-06-04 21:39+0200\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resumé"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Ukendt*"
diff --git a/koffice-i18n-da/messages/koffice/kfile_koffice.po b/koffice-i18n-da/messages/koffice/tdefile_koffice.po
index df45a6e1..73873df0 100644
--- a/koffice-i18n-da/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-da/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# Danish translation of kfile_koffice
+# Danish translation of tdefile_koffice
 # Copyright (C).
 # Lars K. Schunk <lars@schunk.dk>, 2002.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-01 11:33+0200\n"
 "Last-Translator: Lars K. Schunk <lars@schunk.dk>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resumé"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Ukendt*"
diff --git a/koffice-i18n-da/messages/koffice/kfile_ooo.po b/koffice-i18n-da/messages/koffice/tdefile_ooo.po
index fbc6b75c..d144a700 100644
--- a/koffice-i18n-da/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-da/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# Danish translation of kfile_ooo
+# Danish translation of tdefile_ooo
 # Copyright (C).
 # Erik Kjær Pedersen <erik@binghamton.edu>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-05-31 11:47+0200\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Udskrevet af"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Udskriv dato"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dato"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Oprettelsesdato"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Skaber"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generator"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Redigeringscykler"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Redigeringsvarighed"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Emne"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Sprog"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Remiser"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabeller"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Billeder"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekter"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-Objekter"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sider"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraffer"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Ord"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celler"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Tegn"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rækker"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Brugerdefineret"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Nøgleord"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dokument avanceret"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentstatistikker"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-de/acinclude.m4
+++ b/koffice-i18n-de/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-de/messages/koffice/desktop_koffice.po b/koffice-i18n-de/messages/koffice/desktop_koffice.po
index 2ff5ddfc..f6ec6f12 100644
--- a/koffice-i18n-de/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-de/messages/koffice/desktop_koffice.po
@@ -2159,19 +2159,19 @@ msgstr "Name=Textdokument ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Neues KWord-Dokument:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice Info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org Info"
 
diff --git a/koffice-i18n-de/messages/koffice/kfile_abiword.po b/koffice-i18n-de/messages/koffice/tdefile_abiword.po
index d8244297..d83dd898 100644
--- a/koffice-i18n-de/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-de/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Deutsch
+# translation of tdefile_abiword.po to Deutsch
 #
 # Jannick Kuhr <jakuhr-linux@gmx.de>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-12-09 23:30+0100\n"
 "Last-Translator: Jannick Kuhr <jakuhr-linux@gmx.de>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokument-Information"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Zusammenfassung"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "Unbekannt"
diff --git a/koffice-i18n-de/messages/koffice/kfile_gnumeric.po b/koffice-i18n-de/messages/koffice/tdefile_gnumeric.po
index 815563ca..1735ddd4 100644
--- a/koffice-i18n-de/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-de/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Deutsch
+# translation of tdefile_gnumeric.po to Deutsch
 #
 # Jannick Kuhr <jakuhr-linux@gmx.de>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-12-09 23:32+0100\n"
 "Last-Translator: Jannick Kuhr <jakuhr-linux@gmx.de>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokument-Information"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Zusammenfassung"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "Unbekannt"
diff --git a/koffice-i18n-de/messages/koffice/kfile_koffice.po b/koffice-i18n-de/messages/koffice/tdefile_koffice.po
index ab59a347..1f41720a 100644
--- a/koffice-i18n-de/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-de/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Deutsch
+# translation of tdefile_koffice.po to Deutsch
 # Copyright (C).
 # Thomas Diehl <thd@kde.org>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-14 15:10+0200\n"
 "Last-Translator: Thomas Diehl <thd@kde.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokument-Information"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Zusammenfassung"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "Unbekannt"
diff --git a/koffice-i18n-de/messages/koffice/kfile_ooo.po b/koffice-i18n-de/messages/koffice/tdefile_ooo.po
index 48b47d02..56877b06 100644
--- a/koffice-i18n-de/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-de/messages/koffice/tdefile_ooo.po
@@ -1,12 +1,12 @@
-# translation of kfile_ooo.po to German
-# Übersetzung von kfile_ooo.po ins Deutsche
+# translation of tdefile_ooo.po to German
+# Übersetzung von tdefile_ooo.po ins Deutsche
 # Copyright (C)
 # Thomas Diehl <thd@kde.org>, 2003.
 # Stephan Johach <hunsum@gmx.de>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-05-21 18:16+0200\n"
 "Last-Translator: Stephan Johach <hunsum@gmx.de>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Gedruckt von"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Druckdatum"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Erstellt von"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Ersteller"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Bearbeitungsdurchläufe"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Bearbeitungsdauer"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Betreff"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Sprache"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Zeichnungen"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabellen"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Bilder"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekte"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-Objekte"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Seiten"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Absätze"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Wörter"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Zellen"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Zeichen"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Zeilen"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Benutzerdefiniert"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokument-Information"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Stichwörter"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dokument (erweitert)"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentstatistik"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-el/acinclude.m4
+++ b/koffice-i18n-el/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-el/messages/koffice/desktop_koffice.po b/koffice-i18n-el/messages/koffice/desktop_koffice.po
index 9b8e468a..ca3ec83c 100644
--- a/koffice-i18n-el/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-el/messages/koffice/desktop_koffice.po
@@ -2171,19 +2171,19 @@ msgstr "Name=Έγγραφο κειμένου..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Νέο έγγραφο KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Πληροφορίες Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Πληροφορίες Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Πληροφορίες KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Πληροφορίες OpenOffice.org"
 
diff --git a/koffice-i18n-el/messages/koffice/kfile_abiword.po b/koffice-i18n-el/messages/koffice/tdefile_abiword.po
index b399e0e3..d696665a 100644
--- a/koffice-i18n-el/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-el/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Greek
+# translation of tdefile_abiword.po to Greek
 # Spiros Georgaras <sng@hellug.gr>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-08-15 10:14+0300\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Πληροφορίες εγγράφου"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Τίτλος"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Περίληψη"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Άγνωστο*"
diff --git a/koffice-i18n-el/messages/koffice/kfile_gnumeric.po b/koffice-i18n-el/messages/koffice/tdefile_gnumeric.po
index f455230d..ebd04f21 100644
--- a/koffice-i18n-el/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-el/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Greek
+# translation of tdefile_gnumeric.po to Greek
 # Spiros Georgaras <sng@hellug.gr>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-06-03 23:19+0300\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Πληροφορίες εγγράφου"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Τίτλος"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Περίληψη"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Άγνωστο*"
diff --git a/koffice-i18n-el/messages/koffice/kfile_koffice.po b/koffice-i18n-el/messages/koffice/tdefile_koffice.po
index cce05ed9..1c209bde 100644
--- a/koffice-i18n-el/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-el/messages/koffice/tdefile_koffice.po
@@ -1,9 +1,9 @@
-# translation of kfile_koffice.po to Greek
+# translation of tdefile_koffice.po to Greek
 # Yannis Kollias <jonnie_kgr@inMail24.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2005-08-30 12:55+0300\n"
 "Last-Translator: Yannis Kollias <jonnie_kgr@inMail24.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Πληροφορίες εγγράφου"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Τίτλος"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Περίληψη"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Άγνωστο*"
diff --git a/koffice-i18n-el/messages/koffice/kfile_ooo.po b/koffice-i18n-el/messages/koffice/tdefile_ooo.po
index 0d9f464e..b406cdc1 100644
--- a/koffice-i18n-el/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-el/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Greek
+# translation of tdefile_ooo.po to Greek
 # Yannis Kollias <jonnie_kgr@inMail24.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-08-30 13:00+0300\n"
 "Last-Translator: Yannis Kollias <jonnie_kgr@inMail24.com>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Εκτυπώθηκε από"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Ημερομηνία εκτύπωσης"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Ημερομηνία δημιουργίας"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Δημιουργός"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Δημιουργός"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Κύκλοι επεξεργασίας"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Διάρκεια επεξεργασίας"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Τίτλος"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Συγγραφέας"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Θέμα"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Ζωγραφιές"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Πίνακες"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Εικόνες"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Αντικείμενα"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Αντικείμενα OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Σελίδες"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Παράγραφοι"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Λέξεις"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Κελιά"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Χαρακτήρες"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Γραμμές"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Ορισμένο από το χρήστη"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Πληροφορίες εγγράφου"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Λέξεις κλειδιά"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Προχωρημένο έγγραφο"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Στατιστικά εγγράφου"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-en_GB/acinclude.m4
+++ b/koffice-i18n-en_GB/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
index ede2b9b4..9cbc81b5 100644
--- a/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
@@ -2187,19 +2187,19 @@ msgstr "Name=Text Document..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=New KWord document:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice Info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org Info"
 
diff --git a/koffice-i18n-en_GB/messages/koffice/kfile_koffice.po b/koffice-i18n-en_GB/messages/koffice/tdefile_koffice.po
index 489a214e..3cd39062 100644
--- a/koffice-i18n-en_GB/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-en_GB/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Document Information"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Author"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Title"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Abstract"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Unknown*"
diff --git a/koffice-i18n-en_GB/messages/koffice/kfile_ooo.po b/koffice-i18n-en_GB/messages/koffice/tdefile_ooo.po
index 54c5adc2..51653e5f 100644
--- a/koffice-i18n-en_GB/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-en_GB/messages/koffice/tdefile_ooo.po
@@ -1,4 +1,4 @@
-# translation of kfile_ooo.po to British English
+# translation of tdefile_ooo.po to British English
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Malcolm Hunter <malcolm.hunter@gmx.co.uk>, 2003.
 # Jonathan Riddell <kde-en-gb@jriddell.org>, 2003.
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-05-27 12:01+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Printed By"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Print Date"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Date"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Creation Date"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creator"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generator"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Editing Cycles"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Editing Duration"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Title"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Author"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Description"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Subject"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Language"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Draws"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tables"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Images"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objects"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE Objects"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pages"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraphs"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Words"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cells"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Characters"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rows"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "User Defined"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Document Information"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Keywords"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Document Advanced"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Document Statistics"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-es/acinclude.m4
+++ b/koffice-i18n-es/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-es/messages/koffice/desktop_koffice.po b/koffice-i18n-es/messages/koffice/desktop_koffice.po
index f68f1129..945190de 100644
--- a/koffice-i18n-es/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-es/messages/koffice/desktop_koffice.po
@@ -2169,19 +2169,19 @@ msgstr "Name=Documento de texto..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nuevo documento de KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Información de Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Información de Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Información de KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Información de OpenOffice.org"
 
diff --git a/koffice-i18n-es/messages/koffice/kfile_abiword.po b/koffice-i18n-es/messages/koffice/tdefile_abiword.po
index 2284ba2f..cdf533ca 100644
--- a/koffice-i18n-es/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-es/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Spanish
+# translation of tdefile_abiword.po to Spanish
 #
 # Juan Manuel Garcia Molina <juanma@superiodico.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-03-03 17:00+0100\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Información del documento"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resumen"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Desconocido*"
diff --git a/koffice-i18n-es/messages/koffice/kfile_gnumeric.po b/koffice-i18n-es/messages/koffice/tdefile_gnumeric.po
index 707e59fe..54d82ec8 100644
--- a/koffice-i18n-es/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-es/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Spanish
+# translation of tdefile_gnumeric.po to Spanish
 #
 # Juan Manuel Garcia Molina <juanma@superiodico.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-03-03 17:01+0100\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Información del documento"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resumen"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Desconocido*"
diff --git a/koffice-i18n-es/messages/koffice/kfile_koffice.po b/koffice-i18n-es/messages/koffice/tdefile_koffice.po
index b3af2c4e..1719de83 100644
--- a/koffice-i18n-es/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-es/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
-# translation of kfile_koffice.po to Spanish
-# Spanish .po file for kfile_koffice.
+# translation of tdefile_koffice.po to Spanish
+# Spanish .po file for tdefile_koffice.
 # Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 # Juan Manuel Garcia Molina <juanma@superiodico.net>, 2002,2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-11-21 19:43+0100\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Información del documento"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Título"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resumen"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Desconocido*"
diff --git a/koffice-i18n-es/messages/koffice/kfile_ooo.po b/koffice-i18n-es/messages/koffice/tdefile_ooo.po
index 0a30b5ee..da87be15 100644
--- a/koffice-i18n-es/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-es/messages/koffice/tdefile_ooo.po
@@ -1,12 +1,12 @@
-# Translation of kfile_ooo to Spanish
-# translation of kfile_ooo.po to Spanish
+# Translation of tdefile_ooo to Spanish
+# translation of tdefile_ooo.po to Spanish
 # Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 #
 # Juan Manuel Garcia Molina <juanma@superiodico.net>, 2003, 2004.
 # Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-05-03 09:20+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
@@ -17,122 +17,122 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Impreso por"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Fecha de impresión"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Fecha"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Fecha de creación"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creador"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generador"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Ciclos de edición"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Duración de la edición"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Título"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descripción"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Asunto"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Idioma"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Dibujos"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tablas"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imágenes"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objetos"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objetos OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Páginas"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Párrafos"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Palabras"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celdas"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caracteres"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Filas"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definido por el usuario"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Información del documento"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avanzado del documento"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Estadísticas del documento"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-et/messages/koffice/desktop_koffice.po b/koffice-i18n-et/messages/koffice/desktop_koffice.po
index 58fe6a5c..ec857a56 100644
--- a/koffice-i18n-et/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-et/messages/koffice/desktop_koffice.po
@@ -2138,19 +2138,19 @@ msgstr "Name=Tekstidokument..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Uus KWordi dokument:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword'i info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric'i info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice'i info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-i info"
 
diff --git a/koffice-i18n-et/messages/koffice/kfile_abiword.po b/koffice-i18n-et/messages/koffice/tdefile_abiword.po
index 3f1a170d..c2ca1f85 100644
--- a/koffice-i18n-et/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-et/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Estonian
+# translation of tdefile_abiword.po to Estonian
 # Marek Laane <bald@starman.ee>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-07-12 14:12+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokumendi info"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Pealkiri"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Kokkuvõte"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Tundmatu*"
diff --git a/koffice-i18n-et/messages/koffice/kfile_gnumeric.po b/koffice-i18n-et/messages/koffice/tdefile_gnumeric.po
index fd562da2..36bf9beb 100644
--- a/koffice-i18n-et/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-et/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Estonian
+# translation of tdefile_gnumeric.po to Estonian
 # Marek Laane <bald@starman.ee>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-07-12 14:13+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokumendi info"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Pealkiri"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Kokkuvõte"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Tundmatu*"
diff --git a/koffice-i18n-et/messages/koffice/kfile_koffice.po b/koffice-i18n-et/messages/koffice/tdefile_koffice.po
index b6438ca7..f7dd935f 100644
--- a/koffice-i18n-et/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-et/messages/koffice/tdefile_koffice.po
@@ -1,4 +1,4 @@
-# Translation of kfile_koffice.po to Estonian.
+# Translation of tdefile_koffice.po to Estonian.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumendi info"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Tiitel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Selgitus"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Tundmatu*"
diff --git a/koffice-i18n-et/messages/koffice/kfile_ooo.po b/koffice-i18n-et/messages/koffice/tdefile_ooo.po
index aed1c389..2e0f7de5 100644
--- a/koffice-i18n-et/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-et/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Estonian
+# translation of tdefile_ooo.po to Estonian
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Ain Vagula <ain@kmprojekt.ee>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2003-07-13 20:36+0300\n"
 "Last-Translator: Ain Vagula <ain@kmprojekt.ee>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Trükitud"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Trükikuupäev"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Kuupäev"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Loomise kuupäev"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Rakendus"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Redigeerimistsüklid"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Redigeerimise kestus"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Pealkiri"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Subjekt"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Keel"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Jooniseid"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabeleid"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Pilte"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekte"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE objekte"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Lehekülgi"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Lõike"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Sõnu"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Lahtreid"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Sümboleid"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Ridu"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Kasutaja määratud"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumendi info"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Võtmesõnad"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Täiendav info"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumendi statistika"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-eu/acinclude.m4
+++ b/koffice-i18n-eu/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-eu/messages/koffice/desktop_koffice.po b/koffice-i18n-eu/messages/koffice/desktop_koffice.po
index 17043294..331f9909 100644
--- a/koffice-i18n-eu/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-eu/messages/koffice/desktop_koffice.po
@@ -2292,21 +2292,21 @@ msgstr "Name=Testu-dokumentua..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=KWord dokumentu berria:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 #, fuzzy
 msgid "Name=Abiword Info"
 msgstr "Name=KOffice-en informazioa"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 #, fuzzy
 msgid "Name=Gnumeric Info"
 msgstr "Name=KOffice-en informazioa"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-en informazioa"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-en informazioa"
 
diff --git a/koffice-i18n-eu/messages/koffice/kfile_koffice.po b/koffice-i18n-eu/messages/koffice/tdefile_koffice.po
index 2b019568..3b6bdbb3 100644
--- a/koffice-i18n-eu/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-eu/messages/koffice/tdefile_koffice.po
@@ -1,9 +1,9 @@
-# translation of kfile_koffice.po to Basque
+# translation of tdefile_koffice.po to Basque
 # Ion Gaztañaga <igaztanaga@gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2005-08-24 16:08-0600\n"
 "Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumentuaren informazioa"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Egilea"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Izenburua"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Laburpena"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Ezezaguna*"
diff --git a/koffice-i18n-eu/messages/koffice/kfile_ooo.po b/koffice-i18n-eu/messages/koffice/tdefile_ooo.po
index fa853e30..2b02b633 100644
--- a/koffice-i18n-eu/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-eu/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Basque
+# translation of tdefile_ooo.po to Basque
 # Ion Gaztañaga <igaztanaga@gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-08-13 02:19+0200\n"
 "Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Nork inprimatua"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Inprimatze-data"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Sortze-data"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Egilea"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Sorgailua"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Edizio-zikloak"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Edizioaren iraupena"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Izenburua"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Egilea"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Deskribapena"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Gaia"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Marrazkiak"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Taulak"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Irudiak"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objektuak"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE objektuak"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Orriak"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Parrafoak"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Hitzak"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Gelaxkak"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Karaktereak"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Lerroak"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Erabiltzaileak definitua"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumentuaren informazioa"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Gako-hitzak"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dokumentu aurreratua"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentuaren estatistikak"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-fa/acinclude.m4
+++ b/koffice-i18n-fa/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-fa/messages/koffice/desktop_koffice.po b/koffice-i18n-fa/messages/koffice/desktop_koffice.po
index ff52bc44..d55d65af 100644
--- a/koffice-i18n-fa/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fa/messages/koffice/desktop_koffice.po
@@ -2140,19 +2140,19 @@ msgstr "Name=سند متنی..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=سند جدید KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=اطلاعات Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=اطلاعات Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=اطلاعات KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=اطلاعات OpenOffice.org"
 
diff --git a/koffice-i18n-fa/messages/koffice/kfile_abiword.po b/koffice-i18n-fa/messages/koffice/tdefile_abiword.po
index 95427636..e0046b16 100644
--- a/koffice-i18n-fa/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-fa/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Persian
+# translation of tdefile_abiword.po to Persian
 #
 # Nasim Daniarzadeh <daniarzadeh@itland.ir>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2007-02-03 15:37+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplural=1; plural=0;\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "اطلاعات سند"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "نویسنده"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "عنوان"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "چکیده"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*ناشناخته*"
diff --git a/koffice-i18n-fa/messages/koffice/kfile_gnumeric.po b/koffice-i18n-fa/messages/koffice/tdefile_gnumeric.po
index 53f3fdd2..b0f46e77 100644
--- a/koffice-i18n-fa/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-fa/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Persian
+# translation of tdefile_gnumeric.po to Persian
 #
 # Nasim Daniarzadeh <daniarzadeh@itland.ir>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2007-02-03 15:36+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplural=1; plural=0;\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "اطلاعات سند"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "نویسنده"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "عنوان"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "چکیده"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*ناشناخته*"
diff --git a/koffice-i18n-fa/messages/koffice/kfile_koffice.po b/koffice-i18n-fa/messages/koffice/tdefile_koffice.po
index f881312f..90d4fbe3 100644
--- a/koffice-i18n-fa/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-fa/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
-# translation of kfile_koffice.po to Persian
+# translation of tdefile_koffice.po to Persian
 # Copyright (C).
 #
 # FarsiKDE Team <info@farsikde.org>, 2003.
 # Nasim Daniarzadeh <daniarzadeh@itland.ir>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-01-17 13:33+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "اطلاعات سند"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "نویسنده"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "عنوان"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "خلاصه"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*ناشناخته*"
diff --git a/koffice-i18n-fa/messages/koffice/kfile_ooo.po b/koffice-i18n-fa/messages/koffice/tdefile_ooo.po
index 0076f8aa..afbd4ba3 100644
--- a/koffice-i18n-fa/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-fa/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Persian
+# translation of tdefile_ooo.po to Persian
 #
 # MaryamSadat Razavi <razavi@itland.ir>, 2007.
 # Nasim Daniarzadeh <daniarzadeh@itland.ir>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-02-04 16:00+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplural=1; plural=0;\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "چاپ‌شده با"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "تاریخ چاپ"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "تاریخ"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "تاریخ ایجاد"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "ایجادکننده"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "مولد"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "چرخه‌های ویرایش"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "دوام ویرایش"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "عنوان"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "نویسنده"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "توصیف"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "موضوع"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "زبان"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "ترسیمات"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "جدولها"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "تصاویر"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "اشیاء"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "اشیاء OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "صفحات"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "بندها"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "واژه‌ها"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "سلولها"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "نویسه‌ها"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "سطرها"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "تعریف‌شدۀ کاربر"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "اطلاعات سند"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "واژه‌های کلیدی"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "پیشرفتۀ سند"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "آمار سند"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr ""
diff --git a/koffice-i18n-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-fi/acinclude.m4
+++ b/koffice-i18n-fi/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-fi/messages/koffice/desktop_koffice.po b/koffice-i18n-fi/messages/koffice/desktop_koffice.po
index e21054ca..14045ca6 100644
--- a/koffice-i18n-fi/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fi/messages/koffice/desktop_koffice.po
@@ -2230,19 +2230,19 @@ msgstr "Name=Tekstiasiakirja..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Uusi KWord-asiakirja:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-tiedot"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-tiedot"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-tiedot"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-tiedot"
 
diff --git a/koffice-i18n-fi/messages/koffice/kfile_abiword.po b/koffice-i18n-fi/messages/koffice/tdefile_abiword.po
index 9844b7c0..5ebd22fe 100644
--- a/koffice-i18n-fi/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-fi/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to finnish
+# translation of tdefile_abiword.po to finnish
 #
 # Ilpo Kantonen <ilpo@iki.fi>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-09-15 05:29+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Asiakirjan tiedot"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Tekijä"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Otsikko"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Abstrakti"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Tuntematon*"
diff --git a/koffice-i18n-fi/messages/koffice/kfile_gnumeric.po b/koffice-i18n-fi/messages/koffice/tdefile_gnumeric.po
index dcd4071e..eb9062b3 100644
--- a/koffice-i18n-fi/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-fi/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to finnish
+# translation of tdefile_gnumeric.po to finnish
 #
 # Ilpo Kantonen <ilpo@iki.fi>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-09-15 05:31+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Asiakirjan tiedot"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Tekijä"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Otsikko"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Abstrakti"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Tuntematon*"
diff --git a/koffice-i18n-fi/messages/koffice/kfile_koffice.po b/koffice-i18n-fi/messages/koffice/tdefile_koffice.po
index c9a36a4f..6d56f847 100644
--- a/koffice-i18n-fi/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-fi/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Finnish
+# translation of tdefile_koffice.po to Finnish
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Teemu Rytilahti <teemu.rytilahti@d5k.net>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-03-16 11:37+0200\n"
 "Last-Translator: Teemu Rytilahti <teemu.rytilahti@d5k.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Asiakirjan tiedot"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Tekijä"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Otsikko"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Abstrakti"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Tuntematon*"
diff --git a/koffice-i18n-fi/messages/koffice/kfile_ooo.po b/koffice-i18n-fi/messages/koffice/tdefile_ooo.po
index 5dfc1fcf..ff8cb6ff 100644
--- a/koffice-i18n-fi/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-fi/messages/koffice/tdefile_ooo.po
@@ -1,5 +1,5 @@
-# translation of kfile_ooo.po to finnish
-# translation of kfile_ooo.po to Finnish
+# translation of tdefile_ooo.po to finnish
+# translation of tdefile_ooo.po to Finnish
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Mikko Ikola <ikola@iki.fi>, 2003.
 # Tapio Kautto <eleknader@phnet.fi>, 2004.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-06-09 19:19+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
@@ -18,122 +18,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Tulostanut"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Tulostamispäivämäärä"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Päivänmäärä"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Luontipäivänmäärä"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Luoja"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Luotu käyttäen"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Muokkauskerrat"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Muokkaa kestoa"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Otsikko"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Tekijä"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Kuvaus"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Aihe"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Kieli"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Piirrokset"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Taulukot"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Kuvat"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objektit"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-objektit"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sivut"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Kappaleet"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Sanat"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Solut"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Merkit"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rivit"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Käyttäjän määrittelemä"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Asiakirjan tiedot"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Hakusanat"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Tarkemmat tiedot"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Asiakirjan tilastot"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-fr/messages/koffice/desktop_koffice.po b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
index d9382222..6013b498 100644
--- a/koffice-i18n-fr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
@@ -2170,19 +2170,19 @@ msgstr "Name=Document texte..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nouveau document KWord :"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informations sur Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informations sur Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informations sur KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informations sur OpenOffice.org"
 
diff --git a/koffice-i18n-fr/messages/koffice/kfile_abiword.po b/koffice-i18n-fr/messages/koffice/tdefile_abiword.po
index 16cdcc86..fece5574 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to French
+# translation of tdefile_abiword.po to French
 #
 # Matthieu Robin <kde@macolu.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-03-29 20:42+0200\n"
 "Last-Translator: Matthieu Robin <kde@macolu.org>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_gnumeric.po b/koffice-i18n-fr/messages/koffice/tdefile_gnumeric.po
index b0dcf152..5feef29a 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to French
+# translation of tdefile_gnumeric.po to French
 #
 # Matthieu Robin <kde@macolu.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-03-29 20:42+0200\n"
 "Last-Translator: Matthieu Robin <kde@macolu.org>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_koffice.po b/koffice-i18n-fr/messages/koffice/tdefile_koffice.po
index 91c86d3b..64a40bc8 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
-# translation of kfile_koffice.po to Français
+# translation of tdefile_koffice.po to Français
 # Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 # Gérard Delafond <gerard@delafond.org>, 2002.
 # Joëlle Conavin <jcornavi@kde-france.org>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2004-05-19 01:29+0200\n"
 "Last-Translator: Joëlle Conavin <jcornavi@kde-france.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_ooo.po b/koffice-i18n-fr/messages/koffice/tdefile_ooo.po
index 272d5c31..d491783d 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_ooo.po
@@ -1,12 +1,12 @@
-# translation of kfile_ooo.po to Français
-# translation of kfile_ooo.po to français
+# translation of tdefile_ooo.po to Français
+# translation of tdefile_ooo.po to français
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Ludovic Grossard <grossard@kde.org>, 2003.
 # Joëlle Conavin <jcornavi@kde-france.org>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-05 14:07+0100\n"
 "Last-Translator: Simon DEPIETS <2df@tuxfamily.org>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Imprimé par"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Date d'impression"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Date"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Créateur"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Générateur"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cycles d'édition"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Edition de la durée"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Description"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Sujet"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Langue"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Dessins"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tableaux"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Images"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objets"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objets OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pages"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraphes"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Mots"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cellules"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caractères"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Lignes"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Défini par l'utilisateur"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Autres paramètres du document"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistiques du document"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ga/acinclude.m4
+++ b/koffice-i18n-ga/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ga/messages/koffice/desktop_koffice.po b/koffice-i18n-ga/messages/koffice/desktop_koffice.po
index db6e4831..dcb8ceb9 100644
--- a/koffice-i18n-ga/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ga/messages/koffice/desktop_koffice.po
@@ -2120,19 +2120,19 @@ msgstr "Name=Cáipéis Téacs..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Cáipéis nua KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Eolas faoi Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Ginearálta"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Eolas faoi KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Eolas faoi OpenOffice.org"
 
diff --git a/koffice-i18n-ga/messages/koffice/kfile_abiword.po b/koffice-i18n-ga/messages/koffice/tdefile_abiword.po
index 122fc35b..accf78a8 100644
--- a/koffice-i18n-ga/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-ga/messages/koffice/tdefile_abiword.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: koffice/kfile_abiword.po\n"
+"Project-Id-Version: koffice/tdefile_abiword.po\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-06-16 09:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Eolas faoin Cháipéis"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Údar"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Teideal"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Coimriú"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Anaithnid*"
diff --git a/koffice-i18n-ga/messages/koffice/kfile_gnumeric.po b/koffice-i18n-ga/messages/koffice/tdefile_gnumeric.po
index 6d93c985..78ce1f64 100644
--- a/koffice-i18n-ga/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-ga/messages/koffice/tdefile_gnumeric.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: koffice/kfile_gnumeric.po\n"
+"Project-Id-Version: koffice/tdefile_gnumeric.po\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-06-01 19:17-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Eolas faoin Cháipéis"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Údar"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Teideal"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Coimriú"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Anaithnid*"
diff --git a/koffice-i18n-ga/messages/koffice/kfile_koffice.po b/koffice-i18n-ga/messages/koffice/tdefile_koffice.po
index 2eeec589..2d2b013f 100644
--- a/koffice-i18n-ga/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ga/messages/koffice/tdefile_koffice.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: koffice/kfile_koffice.po\n"
+"Project-Id-Version: koffice/tdefile_koffice.po\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Eolas faoin Cháipéis"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Údar"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Teideal"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Coimriú"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Anaithnid*"
diff --git a/koffice-i18n-ga/messages/koffice/kfile_ooo.po b/koffice-i18n-ga/messages/koffice/tdefile_ooo.po
index 221b3e92..50130bc6 100644
--- a/koffice-i18n-ga/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ga/messages/koffice/tdefile_ooo.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: koffice/kfile_ooo.po\n"
+"Project-Id-Version: koffice/tdefile_ooo.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
@@ -9,122 +9,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Priontáilte Ag"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Dáta Priontála"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dáta"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Dáta a Cruthaíodh"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Cruthaitheoir"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Gineadóir"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Timthriallta Eagarthóireachta"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Aga Eagarthóireachta"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Teideal"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Údar"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Cur Síos"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Ábhar"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Teanga"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Líníochtaí"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Táblaí"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Íomhánna"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Réada"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Réada OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Leathanaigh"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Ailt"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Focail"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cealla"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Carachtair"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rónna"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Sainithe ag an Úsáideoir"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Eolas faoin Cháipéis"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Lorgfhocail"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Ardroghanna na Cáipéise"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Staitistic don Cháipéis"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-gl/acinclude.m4
+++ b/koffice-i18n-gl/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-gl/messages/koffice/desktop_koffice.po b/koffice-i18n-gl/messages/koffice/desktop_koffice.po
index 4ff3bbb7..caa83cbf 100644
--- a/koffice-i18n-gl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-gl/messages/koffice/desktop_koffice.po
@@ -2164,19 +2164,19 @@ msgstr "Name=Documento de Texto..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Novo documento de KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Información de Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Información de Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Información de KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Información de OpenOffice.org"
 
diff --git a/koffice-i18n-gl/messages/koffice/kfile_abiword.po b/koffice-i18n-gl/messages/koffice/tdefile_abiword.po
index cfe9f659..bb326a45 100644
--- a/koffice-i18n-gl/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-gl/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Galician
+# translation of tdefile_abiword.po to Galician
 #
 # mvillarino <mvillarino@users.sourceforge.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-06-25 10:20+0200\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Información do Documento"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Descoñecido*"
diff --git a/koffice-i18n-gl/messages/koffice/kfile_gnumeric.po b/koffice-i18n-gl/messages/koffice/tdefile_gnumeric.po
index b1fde315..d3da6750 100644
--- a/koffice-i18n-gl/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-gl/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Galician
+# translation of tdefile_gnumeric.po to Galician
 #
 # mvillarino <mvillarino@users.sourceforge.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-06-25 18:47+0200\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Información do Documento"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Descoñecido*"
diff --git a/koffice-i18n-gl/messages/koffice/kfile_koffice.po b/koffice-i18n-gl/messages/koffice/tdefile_koffice.po
index c2e0139a..db17b0ed 100644
--- a/koffice-i18n-gl/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-gl/messages/koffice/tdefile_koffice.po
@@ -1,9 +1,9 @@
-# translation of kfile_koffice.po to Galician
+# translation of tdefile_koffice.po to Galician
 #
 # mvillarino <mvillarino@users.sourceforge.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2006-06-25 18:48+0200\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Información do Documento"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Título"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Descoñecido*"
diff --git a/koffice-i18n-gl/messages/koffice/kfile_ooo.po b/koffice-i18n-gl/messages/koffice/tdefile_ooo.po
index e638d9a4..6ce9ee7f 100644
--- a/koffice-i18n-gl/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-gl/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Galician
+# translation of tdefile_ooo.po to Galician
 #
 # mvillarino <mvillarino@users.sourceforge.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2006-06-25 18:50+0200\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Impreso Por"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data de Impresión"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data de Criación"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Criador"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Xerador"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Ciclos de Edición"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Duración da Edición"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Título"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descrición"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Asunto"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Lingua"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Debuxos"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Táboas"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imaxes"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Obxectos"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Obxectos OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Páxinas"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Parágrafos"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Palabras"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celas"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caracteres"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Filas"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definido polo Usuário"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Información do Documento"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Palabras-Chave"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avanzado"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Estatísticas do Documento"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-hu/acinclude.m4
+++ b/koffice-i18n-hu/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-hu/messages/koffice/desktop_koffice.po b/koffice-i18n-hu/messages/koffice/desktop_koffice.po
index 334aab0e..3f6a3ed7 100644
--- a/koffice-i18n-hu/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-hu/messages/koffice/desktop_koffice.po
@@ -2136,19 +2136,19 @@ msgstr "Name=KWord-dokumentum..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Új KWord-dokumentum:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-információ"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-információ"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-információ"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-információ"
 
diff --git a/koffice-i18n-hu/messages/koffice/kfile_abiword.po b/koffice-i18n-hu/messages/koffice/tdefile_abiword.po
index 4fa7f949..1a00448f 100644
--- a/koffice-i18n-hu/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-hu/messages/koffice/tdefile_abiword.po
@@ -11,22 +11,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokumentumjellemzők"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Szerző"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Cím"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Kivonat"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Ismeretlen*"
diff --git a/koffice-i18n-hu/messages/koffice/kfile_gnumeric.po b/koffice-i18n-hu/messages/koffice/tdefile_gnumeric.po
index a609fc8b..4369b677 100644
--- a/koffice-i18n-hu/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-hu/messages/koffice/tdefile_gnumeric.po
@@ -11,22 +11,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokumentumjellemzők"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Szerző"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Cím"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Kivonat"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Ismeretlen*"
diff --git a/koffice-i18n-hu/messages/koffice/kfile_koffice.po b/koffice-i18n-hu/messages/koffice/tdefile_koffice.po
index e39ace39..3f666493 100644
--- a/koffice-i18n-hu/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-hu/messages/koffice/tdefile_koffice.po
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumentumjellemzők"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Szerző"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Cím"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Kivonat"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "Ismeretlen"
diff --git a/koffice-i18n-hu/messages/koffice/kfile_ooo.po b/koffice-i18n-hu/messages/koffice/tdefile_ooo.po
index 1b81476e..f40e4991 100644
--- a/koffice-i18n-hu/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-hu/messages/koffice/tdefile_ooo.po
@@ -11,122 +11,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Kinyomtatta"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "A dátum kinyomtatása"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dátum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Létrehozási dátum"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Készítette"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Létrehozó"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Szerkesztési ciklusok"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Szerkesztési időtartam"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Cím"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Szerző"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Leírás"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Tárgy"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Nyelv"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Rajzok"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Táblázatok"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Képek"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objektumok"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE objektumok"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Oldalszám"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Bekezdések"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Szavak"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cellák"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Karakterek"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Sorok"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Felhasználói"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumentumjellemzők"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Kulcsszavak"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Speciális dokumentum"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentumstatisztika"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-it/acinclude.m4
+++ b/koffice-i18n-it/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-it/messages/koffice/desktop_koffice.po b/koffice-i18n-it/messages/koffice/desktop_koffice.po
index 8f6281a7..9cbaeec9 100644
--- a/koffice-i18n-it/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-it/messages/koffice/desktop_koffice.po
@@ -2160,19 +2160,19 @@ msgstr "Name=Documenti di testo..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nuovo documento KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informazioni su Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informazioni su Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informazioni KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informazioni OpenOffice.org"
 
@@ -7805,7 +7805,7 @@ msgstr "Name=File di altri programmi Office"
 #~ msgid "Name=Binary"
 #~ msgstr "Name=Ungheria"
 
-#~ msgid "Name=kab2kabc"
+#~ msgid "Name=tdeab2tdeabc"
 #~ msgstr "Name=KAB2KABC"
 
 #~ msgid "Comment=libkab to libkabc conversion tool."
@@ -8120,8 +8120,8 @@ msgstr "Name=File di altri programmi Office"
 #~ msgid "Name=Enhanced Browsing Plugin"
 #~ msgstr "Name=Plugin di navigazione avanzata"
 
-#~ msgid "Name=kio_uiserver"
-#~ msgstr "Name=kio_uiserver"
+#~ msgid "Name=tdeio_uiserver"
+#~ msgstr "Name=tdeio_uiserver"
 
 #~ msgid "Comment=KDE's Progress Info UI server"
 #~ msgstr "Comment=Server informazioni avanzamento di KDE"
diff --git a/koffice-i18n-it/messages/koffice/kfile_abiword.po b/koffice-i18n-it/messages/koffice/tdefile_abiword.po
index e3f8087c..52847d8d 100644
--- a/koffice-i18n-it/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-it/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Italian
+# translation of tdefile_abiword.po to Italian
 #
 # Luciano Montanaro <mikelima@cirulla.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-11-16 15:53+0100\n"
 "Last-Translator: Luciano Montanaro <mikelima@cirulla.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informazioni sul documento"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autore"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titolo"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Riassunto"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Sconosciuto*"
diff --git a/koffice-i18n-it/messages/koffice/kfile_gnumeric.po b/koffice-i18n-it/messages/koffice/tdefile_gnumeric.po
index b33eae73..be709d95 100644
--- a/koffice-i18n-it/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-it/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Italian
+# translation of tdefile_gnumeric.po to Italian
 #
 # Luciano Montanaro <mikelima@cirulla.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-11-16 15:54+0100\n"
 "Last-Translator: Luciano Montanaro <mikelima@cirulla.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informazioni sul documento"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autore"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titolo"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Riassunto"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Sconosciuto*"
diff --git a/koffice-i18n-it/messages/koffice/kfile_koffice.po b/koffice-i18n-it/messages/koffice/tdefile_koffice.po
index 95c7b189..b12fb4f9 100644
--- a/koffice-i18n-it/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-it/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informazioni sul documento"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autore"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titolo"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Riassunto"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Sconosciuto*"
diff --git a/koffice-i18n-it/messages/koffice/kfile_ooo.po b/koffice-i18n-it/messages/koffice/tdefile_ooo.po
index abd61875..420be139 100644
--- a/koffice-i18n-it/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-it/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Italian
+# translation of tdefile_ooo.po to Italian
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Federico Zenith <zenith@chemeng.ntnu.no>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-05-14 19:05+0200\n"
 "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Stampato da"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data di stampa"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creatore"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generatore"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cicli di modifica"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Durata della modifica"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titolo"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autore"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descrizione"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Soggetto"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Lingua"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Disegni"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabelle"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Immagini"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Oggetti"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Oggetti OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pagine"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragrafi"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Parole"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celle"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caratteri"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Righe"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definito dall'utente"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informazioni sul documento"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Parole chiave"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Informazioni avanzate del documento"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistiche del documento"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ja/acinclude.m4
+++ b/koffice-i18n-ja/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ja/messages/koffice/desktop_koffice.po b/koffice-i18n-ja/messages/koffice/desktop_koffice.po
index 033a0ae8..9561d427 100644
--- a/koffice-i18n-ja/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ja/messages/koffice/desktop_koffice.po
@@ -2127,19 +2127,19 @@ msgstr "Name=テキスト文書..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=新規 KWord ドキュメント:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword 情報"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric 情報"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice 情報"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org 情報"
 
diff --git a/koffice-i18n-ja/messages/koffice/kfile_abiword.po b/koffice-i18n-ja/messages/koffice/tdefile_abiword.po
index 8cda2483..2ba3e122 100644
--- a/koffice-i18n-ja/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-ja/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword to Japanese.
+# translation of tdefile_abiword to Japanese.
 # Yukiko BANDO <ybando@k6.dion.ne.jp>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-10-26 19:00+0900\n"
 "Last-Translator: Yukiko BNADO <ybando@k6.dion.ne.jp>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "ドキュメント情報"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "タイトル"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "要約"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*不明*"
diff --git a/koffice-i18n-ja/messages/koffice/kfile_gnumeric.po b/koffice-i18n-ja/messages/koffice/tdefile_gnumeric.po
index 61581198..ab75fd54 100644
--- a/koffice-i18n-ja/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-ja/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric to Japanese.
+# translation of tdefile_gnumeric to Japanese.
 # Yukiko BANDO <ybando@k6.dion.ne.jp>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-10-26 19:00+0900\n"
 "Last-Translator: Yukiko BANDO <ybando@k6.dion.ne.jp>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "ドキュメント情報"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "タイトル"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "要約"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*不明*"
diff --git a/koffice-i18n-ja/messages/koffice/kfile_koffice.po b/koffice-i18n-ja/messages/koffice/tdefile_koffice.po
index 8396a48c..55d53e8b 100644
--- a/koffice-i18n-ja/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ja/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Japanese
+# translation of tdefile_koffice.po to Japanese
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Taiki Komoda <kom@kde.gr.jp>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-18 15:26JST\n"
 "Last-Translator: Taiki Komoda <kom@kde.gr.jp>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "ドキュメント情報"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "作者"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "題名"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "要約"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*不明*"
diff --git a/koffice-i18n-ja/messages/koffice/kfile_ooo.po b/koffice-i18n-ja/messages/koffice/tdefile_ooo.po
index 9f0647d8..d14bc2e4 100644
--- a/koffice-i18n-ja/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ja/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Japanese
+# translation of tdefile_ooo.po to Japanese
 #
 # Yukiko BANDO <ybando@k6.dion.ne.jp>, 2005, 2007.
 # Fumiaki Okushi <okushi@kde.gr.jp>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-03-14 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "印刷者"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "印刷日"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "日付"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "作成日"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "作成ソフト"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "生成ソフト"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "編集サイクル"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "編集期間"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "タイトル"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "作者"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "説明"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "主題"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "言語"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "ドロー"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "表"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "画像"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "オブジェクト"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE オブジェクト"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "ページ"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "段落"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "単語"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "セル"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "文字"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "行"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "ユーザ定義"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "ドキュメント情報"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "キーワード"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "ドキュメント詳細"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "ドキュメント統計"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1: %2.%3"
diff --git a/koffice-i18n-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4
index b3e654ce..7957d6c6 100644
--- a/koffice-i18n-km/acinclude.m4
+++ b/koffice-i18n-km/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-km/messages/koffice/desktop_koffice.po b/koffice-i18n-km/messages/koffice/desktop_koffice.po
index 9df62182..b1d372b3 100644
--- a/koffice-i18n-km/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-km/messages/koffice/desktop_koffice.po
@@ -2137,19 +2137,19 @@ msgstr "Name=ឯកសារ​អត្ថបទ​..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=ឯកសារ​ KWord  ថ្មី​ ៖"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=ព័ត៌មាន Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=ព័ត៌មាន Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=ព័ត៌មាន KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=ព័ត៌មាន​ OpenOffice.org"
 
diff --git a/koffice-i18n-km/messages/koffice/kfile_abiword.po b/koffice-i18n-km/messages/koffice/tdefile_abiword.po
index 74872fa7..c0bf247b 100644
--- a/koffice-i18n-km/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-km/messages/koffice/tdefile_abiword.po
@@ -1,11 +1,11 @@
-# translation of kfile_abiword.po to Khmer
+# translation of tdefile_abiword.po to Khmer
 #
 # ប៉ុច សុគន្ធ <sokunpoch@khmeros.info>, 2006.
 # Eng Vannak <evannak@khmeros.info>, 2006.
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2007-02-06 13:51+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "ព័ត៌មាន​ឯកសារ"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "អ្នក​និពន្ធ​"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "ចំណង​ជើង​"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "អរូបី"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*មិន​ស្គាល់​*"
diff --git a/koffice-i18n-km/messages/koffice/kfile_gnumeric.po b/koffice-i18n-km/messages/koffice/tdefile_gnumeric.po
index cce08144..eb7ebb36 100644
--- a/koffice-i18n-km/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-km/messages/koffice/tdefile_gnumeric.po
@@ -1,11 +1,11 @@
-# translation of kfile_gnumeric.po to Khmer
+# translation of tdefile_gnumeric.po to Khmer
 #
 # ប៉ុច សុគន្ធ <sokunpoch@khmeros.info>, 2006.
 # Eng Vannak <evannak@khmeros.info>, 2006.
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2007-02-06 13:51+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "ព័ត៌មាន​ឯកសារ"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "អ្នក​និពន្ធ​"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "ចំណង​ជើង​"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "អរូបី"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*មិន​ស្គាល់​*"
diff --git a/koffice-i18n-km/messages/koffice/kfile_koffice.po b/koffice-i18n-km/messages/koffice/tdefile_koffice.po
index 9cc5cf3d..ccbba132 100644
--- a/koffice-i18n-km/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-km/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
-# translation of kfile_koffice.po to Khmer
+# translation of tdefile_koffice.po to Khmer
 #
 # ប៉ុច សុគន្ធ <sokunpoch@khmeros.info>, 2006.
 # Eng Vannak <evannak@khmeros.info>, 2006.
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-02-06 13:52+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "ព័ត៌មាន​ឯកសារ​"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "អ្នក​និពន្ធ​"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "ចំណង​ជើង​"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "អរូបី​"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*មិន​ស្គាល់​*"
diff --git a/koffice-i18n-km/messages/koffice/kfile_ooo.po b/koffice-i18n-km/messages/koffice/tdefile_ooo.po
index 6785150f..ffdb0cde 100644
--- a/koffice-i18n-km/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-km/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
-# translation of kfile_ooo.po to Khmer
+# translation of tdefile_ooo.po to Khmer
 #
 # ប៉ុច សុគន្ធ <sokunpoch@khmeros.info>, 2006.
 # Eng Vannak <evannak@khmeros.info>, 2006.
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-02-06 13:52+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "បាន​បោះពុម្ព​ដោយ"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "កាល​បរិច្ឆេទ​បោះពុម្ព​"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "កាល​បរិច្ឆេទ​"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "កាល​បរិច្ឆេទ​បង្កើត"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "អ្នក​បង្កើត​"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "អ្នក​បង្កើន"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "ខួប​ដែល​កែ​សម្រួល"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "ថេរ​វេលា​ដែល​កែ​សម្រួល"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "ចំណង​ជើង​"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "អ្នក​និពន្ធ​"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "ការពិពណ៌នា​"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "ប្រធាន​បទ​"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "ភាសា​"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "គូរ​"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "តារាង​"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "រូបភាព​"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "វត្ថុ"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "វត្ថុ​OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "ទំព័រ​"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "កថាខណ្ឌ"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "ពាក្យ​"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "សែល​"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "តួ​អក្សរ​"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "ជួរ​ដេក​"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "អ្នក​ប្រើ​ដែល​កំណត់"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "ព័ត៌មាន​ឯកសារ​"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "ពាក្យ​គន្លឹះ​"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "​ឯកសារ​កម្រិត​ខ្ពស់​"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "ស្ថិតិ​ឯកសារ"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1 ៖ %2.%3"
diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-lv/messages/koffice/desktop_koffice.po b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
index e199776a..e71a83ef 100644
--- a/koffice-i18n-lv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
@@ -2364,21 +2364,21 @@ msgstr "Name=Teksta Dokuments"
 msgid "Comment=New KWord document:"
 msgstr "Comment=Jauns KWord dokuments:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 #, fuzzy
 msgid "Name=Abiword Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 #, fuzzy
 msgid "Name=Gnumeric Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 #, fuzzy
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=KOfisa Info"
diff --git a/koffice-i18n-lv/messages/koffice/kfile_koffice.po b/koffice-i18n-lv/messages/koffice/tdefile_koffice.po
index 5d834990..59c09ba4 100644
--- a/koffice-i18n-lv/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-lv/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumenta Informācija"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autors"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Nosaukums"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Referējums"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Nezināms*"
diff --git a/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ms/acinclude.m4
+++ b/koffice-i18n-ms/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ms/messages/koffice/desktop_koffice.po b/koffice-i18n-ms/messages/koffice/desktop_koffice.po
index 53364054..bd7aa774 100644
--- a/koffice-i18n-ms/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ms/messages/koffice/desktop_koffice.po
@@ -2282,21 +2282,21 @@ msgstr "Name=Dokumen Teks..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Dokumen KWord baru:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 #, fuzzy
 msgid "Name=Abiword Info"
 msgstr "Name=Maklumat KOffice"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 #, fuzzy
 msgid "Name=Gnumeric Info"
 msgstr "Name=Maklumat KOffice"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Maklumat KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Maklumat OpenOffice.org"
 
diff --git a/koffice-i18n-ms/messages/koffice/kfile_koffice.po b/koffice-i18n-ms/messages/koffice/tdefile_koffice.po
index 0e0718a5..c303b720 100644
--- a/koffice-i18n-ms/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ms/messages/koffice/tdefile_koffice.po
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Maklumat Dokumen"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Pengarang"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Tajuk"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Abstrak"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Tak diketahui*"
diff --git a/koffice-i18n-ms/messages/koffice/kfile_ooo.po b/koffice-i18n-ms/messages/koffice/tdefile_ooo.po
index c46ef388..b715d625 100644
--- a/koffice-i18n-ms/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ms/messages/koffice/tdefile_ooo.po
@@ -12,122 +12,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Dicetak Oleh"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Tarikh Cetak"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Tarikh"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Tarikh Dicipta"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Pencipta"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Penjana"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Kitar Pengeditan"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Tempoh Pengeditan"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Tajuk"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Pengarang"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Huraian"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Subjek"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Bahasa"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Lukis"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Jadual"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imej"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objek"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objek OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Halaman"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Perenggan"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Kata"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Sel"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Aksara"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Baris"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Pengguna Ditakrifkan"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Maklumat Dokumen"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Kata Kunci"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dokumen Dillanjutkan"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistik Dokumen"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2:%3"
diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-nb/acinclude.m4
+++ b/koffice-i18n-nb/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-nb/messages/koffice/desktop_koffice.po b/koffice-i18n-nb/messages/koffice/desktop_koffice.po
index f86675fd..d53f0685 100644
--- a/koffice-i18n-nb/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nb/messages/koffice/desktop_koffice.po
@@ -2148,19 +2148,19 @@ msgstr "Name=Tekstdokument ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nytt KWord-dokument:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-info"
 
diff --git a/koffice-i18n-nb/messages/koffice/kfile_abiword.po b/koffice-i18n-nb/messages/koffice/tdefile_abiword.po
index fa78128d..8ea7daaf 100644
--- a/koffice-i18n-nb/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-nb/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Norwegian Bokmål
+# translation of tdefile_abiword.po to Norwegian Bokmål
 # Nils Kristian Tomren <project@nilsk.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-12-16 21:29+0100\n"
 "Last-Translator: Nils Kristian Tomren <project@nilsk.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformasjon"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Tittel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Sammendrag"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Ukjent*"
diff --git a/koffice-i18n-nb/messages/koffice/kfile_gnumeric.po b/koffice-i18n-nb/messages/koffice/tdefile_gnumeric.po
index 471233e0..7d3df911 100644
--- a/koffice-i18n-nb/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-nb/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Norwegian Bokmål
+# translation of tdefile_gnumeric.po to Norwegian Bokmål
 # Nils Kristian Tomren <project@nilsk.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-12-16 21:30+0100\n"
 "Last-Translator: Nils Kristian Tomren <project@nilsk.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformasjon"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Tittel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Sammendrag"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Ukjent*"
diff --git a/koffice-i18n-nb/messages/koffice/kfile_koffice.po b/koffice-i18n-nb/messages/koffice/tdefile_koffice.po
index 2a04dc64..500775e9 100644
--- a/koffice-i18n-nb/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-nb/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Norwegian Bokmål
+# translation of tdefile_koffice.po to Norwegian Bokmål
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Axel Bojer <axelb@skolelinux.no>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2005-04-22 21:04+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumentinformasjon"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Tittel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Beskrivelse"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Ukjent*"
diff --git a/koffice-i18n-nb/messages/koffice/kfile_ooo.po b/koffice-i18n-nb/messages/koffice/tdefile_ooo.po
index 9ea4d603..ef9a9fbd 100644
--- a/koffice-i18n-nb/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-nb/messages/koffice/tdefile_ooo.po
@@ -1,7 +1,7 @@
-# translation of kfile_ooo.po to Norwegian Bokmål
-# translation of kfile_ooo.po to Norsk Bokmål
-# translation of kfile_ooo.po to
-# translation of kfile_ooo.po to Norwegian bokmål
+# translation of tdefile_ooo.po to Norwegian Bokmål
+# translation of tdefile_ooo.po to Norsk Bokmål
+# translation of tdefile_ooo.po to
+# translation of tdefile_ooo.po to Norwegian bokmål
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # Axel Bojer <axelb@skolelinux.no>, 2003.
 # Knut Yrvin <knuty@skolelinux.no>, 2003.
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-04-22 21:05+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
@@ -20,122 +20,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Skrevet ut av"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Utskriftsdato"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dato"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Opprettet, dato:"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Laget av"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Laget av:"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Redigeringsrunder"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Redigeringsintervall"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Tittel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Forfatter"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Emne"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Språk"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Tegninger"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabeller"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Bilder"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekter"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-Objekter"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sider"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Avsnitt"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Ord"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celler"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Tegn"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rader"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Selvvalgt"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumentinformasjon"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Stikkord"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avansert dokument"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentstatistik"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-nds/acinclude.m4
+++ b/koffice-i18n-nds/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-nds/messages/koffice/desktop_koffice.po b/koffice-i18n-nds/messages/koffice/desktop_koffice.po
index 8085152a..79bc3d39 100644
--- a/koffice-i18n-nds/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nds/messages/koffice/desktop_koffice.po
@@ -2139,19 +2139,19 @@ msgstr "Name=Textdokment..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nieg KWord-Dokment:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice-Info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org-Info"
 
diff --git a/koffice-i18n-nds/messages/koffice/kfile_abiword.po b/koffice-i18n-nds/messages/koffice/tdefile_abiword.po
index 85fef940..fe08e76f 100644
--- a/koffice-i18n-nds/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-nds/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Low Saxon
+# translation of tdefile_abiword.po to Low Saxon
 #
 # Manfred Wiese <m.j.wiese@web.de>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2007-02-27 14:56+0100\n"
 "Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokment-Informatschonen"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Tosamenfaten"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Nich bekannt*"
diff --git a/koffice-i18n-nds/messages/koffice/kfile_gnumeric.po b/koffice-i18n-nds/messages/koffice/tdefile_gnumeric.po
index 50802c1c..5e8c0ea8 100644
--- a/koffice-i18n-nds/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-nds/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Low Saxon
+# translation of tdefile_gnumeric.po to Low Saxon
 #
 # Manfred Wiese <m.j.wiese@web.de>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2007-02-27 14:57+0100\n"
 "Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokment-Informatschonen"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Tosamenfaten"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Nich bekannt*"
diff --git a/koffice-i18n-nds/messages/koffice/kfile_koffice.po b/koffice-i18n-nds/messages/koffice/tdefile_koffice.po
index 71608d71..4e445079 100644
--- a/koffice-i18n-nds/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-nds/messages/koffice/tdefile_koffice.po
@@ -1,9 +1,9 @@
-# translation of kfile_koffice.po to Low Saxon
+# translation of tdefile_koffice.po to Low Saxon
 #
 # Manfred Wiese <m.j.wiese@web.de>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-02-27 14:57+0100\n"
 "Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokment-Informatschonen"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Tosamenfaten"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Nich bekannt*"
diff --git a/koffice-i18n-nds/messages/koffice/kfile_ooo.po b/koffice-i18n-nds/messages/koffice/tdefile_ooo.po
index da00b8b5..5c632772 100644
--- a/koffice-i18n-nds/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-nds/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Low Saxon
+# translation of tdefile_ooo.po to Low Saxon
 #
 # Manfred Wiese <m.j.wiese@web.de>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-02-27 15:05+0100\n"
 "Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Druckt vun"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Druckdatum"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Opstelldatum"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Opstellt vun"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Opsteller"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Bewerkendörlööp"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Bewerkenduer"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beschrieven"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Bedraap"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Spraak"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Dorstellen"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabellen"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Biller"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekten"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-Objekten"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sieden"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Afsnitten"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Wöör"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Zellen"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Tekens"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Regen"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Vun'n Bruker instellt"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokment-Informatschonen"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Slötelwöör"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dokment (verwiedert)"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokment-Statistik"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ne/acinclude.m4
+++ b/koffice-i18n-ne/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ne/messages/koffice/desktop_koffice.po b/koffice-i18n-ne/messages/koffice/desktop_koffice.po
index f1faba8b..a0243463 100644
--- a/koffice-i18n-ne/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ne/messages/koffice/desktop_koffice.po
@@ -2153,19 +2153,19 @@ msgstr "Name=पाठ कागजात..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=नयाँ केडीई शब्द कागजात:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=एबीआई वर्ड सूचना"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=जीन्यूमेरिक सूचना"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=केडीई कार्यालय सूचना"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=ओपनअफिस डट अर्ग इन्फो"
 
diff --git a/koffice-i18n-ne/messages/koffice/kfile_abiword.po b/koffice-i18n-ne/messages/koffice/tdefile_abiword.po
index 9b68e7a2..ae176601 100644
--- a/koffice-i18n-ne/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-ne/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Nepali
+# translation of tdefile_abiword.po to Nepali
 # Kapil Timilsina <lipak21@gmail.com>, 2006.
 # shyam krishna bal <shyamkrishna_bal@yahoo.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2007-01-11 03:01+0545\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "कागजात सूचना"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "लेखक"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "शीर्षक"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "संक्षेप"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*अज्ञात*"
diff --git a/koffice-i18n-ne/messages/koffice/kfile_gnumeric.po b/koffice-i18n-ne/messages/koffice/tdefile_gnumeric.po
index 39704c55..de4ec06e 100644
--- a/koffice-i18n-ne/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-ne/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Nepali
+# translation of tdefile_gnumeric.po to Nepali
 # Kapil Timilsina <lipak21@gmail.com>, 2006.
 # shyam krishna bal <shyamkrishna_bal@yahoo.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2007-01-11 03:02+0545\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "कागजात सूचना"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "लेखक"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "शीर्षक"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "संक्षेप"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*अज्ञात*"
diff --git a/koffice-i18n-ne/messages/koffice/kfile_koffice.po b/koffice-i18n-ne/messages/koffice/tdefile_koffice.po
index 11976e15..a844bd0d 100644
--- a/koffice-i18n-ne/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ne/messages/koffice/tdefile_koffice.po
@@ -1,9 +1,9 @@
-# translation of kfile_koffice.po to Nepali
+# translation of tdefile_koffice.po to Nepali
 # Kapil Timilsina <lipak21@gmail.com>, 2006.
 # shyam krishna bal <shyamkrishna_bal@yahoo.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-01-11 03:04+0545\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "कागजात सूचना"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "लेखक"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "शीर्षक"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "संक्षेप"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*अज्ञात*"
diff --git a/koffice-i18n-ne/messages/koffice/kfile_ooo.po b/koffice-i18n-ne/messages/koffice/tdefile_ooo.po
index dc0d139e..db6acd84 100644
--- a/koffice-i18n-ne/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ne/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Nepali
+# translation of tdefile_ooo.po to Nepali
 # Kapil Timilsina <lipak21@gmail.com>, 2006.
 # shyam krishna bal <shyamkrishna_bal@yahoo.com>, 2007.
 # Mahesh Subedi <submanesh@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2007-02-11 15:12+0545\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "यसद्वारा मुद्रण गरिएको"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "मुद्रण मिति"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "मिति"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "सिर्जित मिति"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "सर्जक"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "सर्जक"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "चक्रहरू सम्पादन गर्दै"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "अवधि सम्पादन गर्दै"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "शीर्षक"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "लेखक"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "वर्णन"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "विषय"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "भाषा"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "चित्रहरू"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "तालिका"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "छवि"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "वस्तु"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE वस्तु"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "पृष्ठहरू"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "अनुच्छेद"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "शब्दहरू"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "कक्षहरू"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "क्यारेक्टर"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "पङ्क्ति"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "प्रयोगकर्ता परिभाषित"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "कागजात सूचना"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "शब्दकुञ्जी"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "उन्नत कागजात"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "कागजातका तथ्याङ्क"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-nl/acinclude.m4
+++ b/koffice-i18n-nl/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-nl/messages/koffice/desktop_koffice.po b/koffice-i18n-nl/messages/koffice/desktop_koffice.po
index 4a3b4593..fe0e125d 100644
--- a/koffice-i18n-nl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nl/messages/koffice/desktop_koffice.po
@@ -2165,19 +2165,19 @@ msgstr "Name=Tekstdocument..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nieuw KWord-document:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Koffice-info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org Informatie"
 
diff --git a/koffice-i18n-nl/messages/koffice/kfile_abiword.po b/koffice-i18n-nl/messages/koffice/tdefile_abiword.po
index 6431cb48..fa0d035e 100644
--- a/koffice-i18n-nl/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-nl/messages/koffice/tdefile_abiword.po
@@ -1,10 +1,10 @@
-# translation of kfile_abiword.po to Dutch
+# translation of tdefile_abiword.po to Dutch
 #
 # Patrick Vijgeboom <patrick.vijgeboom@wanadoo.nl>, 2006.
 # Rinse de Vries <rinsedevries@kde.nl>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-01-20 00:06+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Documentinformatie"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Samenvatting"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Onbekend*"
diff --git a/koffice-i18n-nl/messages/koffice/kfile_gnumeric.po b/koffice-i18n-nl/messages/koffice/tdefile_gnumeric.po
index d6ae8e6e..bd34a7ae 100644
--- a/koffice-i18n-nl/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-nl/messages/koffice/tdefile_gnumeric.po
@@ -1,10 +1,10 @@
-# translation of kfile_gnumeric.po to Dutch
+# translation of tdefile_gnumeric.po to Dutch
 #
 # Patrick Vijgeboom <patrick.vijgeboom@wanadoo.nl>, 2006.
 # Rinse de Vries <rinsedevries@kde.nl>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-01-20 00:06+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Documentinformatie"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Samenvatting"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Onbekend*"
diff --git a/koffice-i18n-nl/messages/koffice/kfile_koffice.po b/koffice-i18n-nl/messages/koffice/tdefile_koffice.po
index dc795106..1da47fb6 100644
--- a/koffice-i18n-nl/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-nl/messages/koffice/tdefile_koffice.po
@@ -1,12 +1,12 @@
-# translation of kfile_koffice.po to Nederlands
-# Nederlandse vertaling van kfile_koffice
+# translation of tdefile_koffice.po to Nederlands
+# Nederlandse vertaling van tdefile_koffice
 # Copyright (c) 2002 KDE e.V.
 # KDE-vertaalgroep Nederlands
 # Rinse de Vries <rinse@kde.nl>, 2002, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-12-01 12:23+0100\n"
 "Last-Translator: Rinse de Vries <rinse@kde.nl>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Documentinformatie"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Samenvatting"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "<b>Onbekend</b>"
diff --git a/koffice-i18n-nl/messages/koffice/kfile_ooo.po b/koffice-i18n-nl/messages/koffice/tdefile_ooo.po
index 34c6415b..c1f53b6a 100644
--- a/koffice-i18n-nl/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-nl/messages/koffice/tdefile_ooo.po
@@ -1,13 +1,13 @@
-# translation of kfile_ooo.po to 
-# translation of kfile_ooo.po to
-# translation of kfile_ooo.po to Nederlands
+# translation of tdefile_ooo.po to 
+# translation of tdefile_ooo.po to
+# translation of tdefile_ooo.po to Nederlands
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Rinse de Vries <rinse@kde.nl>, 2003.
 # Rinse de Vries <rinsedevries@kde.nl>, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-03-27 00:16+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
@@ -17,122 +17,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Afgedrukt door"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Afdrukdatum"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Aanmaakdatum"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Aangemaakt door"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Auteur"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Bewerkingscycli"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Bewerkingsduur"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Taal"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Tekeningen"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabellen"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objecten"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-objecten"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pagina's"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Alinea's"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Woorden"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cellen"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Lettertekens"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rijen"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Gebruikersgedefinieerd"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Documentinformatie"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Zoektermen"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Document (geavanceerd)"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Documentstatiestieken"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-pl/acinclude.m4
+++ b/koffice-i18n-pl/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-pl/messages/koffice/desktop_koffice.po b/koffice-i18n-pl/messages/koffice/desktop_koffice.po
index 3f8bafea..c40da9cf 100644
--- a/koffice-i18n-pl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pl/messages/koffice/desktop_koffice.po
@@ -2167,19 +2167,19 @@ msgstr "Name=Dokument tekstowy..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nowy dokument KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informacje o Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informacje o Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informacje o KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informacje o OpenOffice.org"
 
diff --git a/koffice-i18n-pl/messages/koffice/kfile_abiword.po b/koffice-i18n-pl/messages/koffice/tdefile_abiword.po
index b06bc4f8..53dbed4d 100644
--- a/koffice-i18n-pl/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-pl/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Polish
+# translation of tdefile_abiword.po to Polish
 #
 # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-03-20 00:21+0100\n"
 "Last-Translator: Krzysztof Lichota <lichota@mimuw.edu.pl>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informacja o dokumencie"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Tytuł"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Streszczenie"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Nieznane*"
diff --git a/koffice-i18n-pl/messages/koffice/kfile_gnumeric.po b/koffice-i18n-pl/messages/koffice/tdefile_gnumeric.po
index 11a0eb43..5173670e 100644
--- a/koffice-i18n-pl/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-pl/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Polish
+# translation of tdefile_gnumeric.po to Polish
 #
 # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-03-20 00:22+0100\n"
 "Last-Translator: Krzysztof Lichota <lichota@mimuw.edu.pl>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informacja o dokumencie"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Tytuł"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Streszczenie"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Nieznane*"
diff --git a/koffice-i18n-pl/messages/koffice/kfile_koffice.po b/koffice-i18n-pl/messages/koffice/tdefile_koffice.po
index bd5c6da2..571b2fd0 100644
--- a/koffice-i18n-pl/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-pl/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Polish
+# translation of tdefile_koffice.po to Polish
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Piotr Szymanski <djurban@linuxpl.org>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-09 00:42+0200\n"
 "Last-Translator: Piotr Szymanski <djurban@linuxpl.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informacje o dokumencie"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Tytuł"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Wyciąg"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Nieznany*"
diff --git a/koffice-i18n-pl/messages/koffice/kfile_ooo.po b/koffice-i18n-pl/messages/koffice/tdefile_ooo.po
index 856e6c6a..e7d23f2c 100644
--- a/koffice-i18n-pl/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-pl/messages/koffice/tdefile_ooo.po
@@ -1,4 +1,4 @@
-# translation of kfile_ooo.po to Polish
+# translation of tdefile_ooo.po to Polish
 # Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 #
 # Piotr Szymanski <djurban@pld-linux.org>, 2003.
@@ -6,7 +6,7 @@
 # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2006-03-20 00:22+0100\n"
 "Last-Translator: Krzysztof Lichota <lichota@mimuw.edu.pl>\n"
@@ -18,122 +18,122 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Wydrukowany przez"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data wydruku"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Twórca"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generator"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cykle edycji"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Czas edycji"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Tytuł"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Opis"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Temat"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Język"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Elementów rysowanych"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabeli"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Obrazki"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Obiektów"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Obiektów ole"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Stron"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Akapitów"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Słów"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Komórek"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Znaków"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Wierszy"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Zdefiniowanych przez użytkownika"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informacje o dokumencie"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Słowa kluczowe"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Zaawansowane"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statystyka"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-pt/acinclude.m4
+++ b/koffice-i18n-pt/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-pt/messages/koffice/desktop_koffice.po b/koffice-i18n-pt/messages/koffice/desktop_koffice.po
index 9c888e7e..36bb59f7 100644
--- a/koffice-i18n-pt/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pt/messages/koffice/desktop_koffice.po
@@ -2172,19 +2172,19 @@ msgstr "Name=Documento de Texto..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Novo documento do KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informação do Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informação do Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informação do KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informação do OpenOffice.org"
 
diff --git a/koffice-i18n-pt/messages/koffice/kfile_abiword.po b/koffice-i18n-pt/messages/koffice/tdefile_abiword.po
index 542d4cb6..b2aa40e9 100644
--- a/koffice-i18n-pt/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-pt/messages/koffice/tdefile_abiword.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-09-20 19:12+0000\n"
 "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informação do Documento"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt/messages/koffice/kfile_gnumeric.po b/koffice-i18n-pt/messages/koffice/tdefile_gnumeric.po
index 9a2fd9d3..5c0297a7 100644
--- a/koffice-i18n-pt/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-pt/messages/koffice/tdefile_gnumeric.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-09-20 19:11+0000\n"
 "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informação do Documento"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt/messages/koffice/kfile_koffice.po b/koffice-i18n-pt/messages/koffice/tdefile_koffice.po
index b379229b..ac3d6d8c 100644
--- a/koffice-i18n-pt/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-pt/messages/koffice/tdefile_koffice.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-23 23:34+0100\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
@@ -10,22 +10,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-POFile-SpellExtra: \n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informação do Documento"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Título"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt/messages/koffice/kfile_ooo.po b/koffice-i18n-pt/messages/koffice/tdefile_ooo.po
index 02dca4ab..9b843315 100644
--- a/koffice-i18n-pt/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-pt/messages/koffice/tdefile_ooo.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-06-08 22:43+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
@@ -10,122 +10,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-POFile-SpellExtra: OLE \n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Impresso Por"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data de Impressão"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Criado por"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Gerador"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Ciclos de Edição"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Duração da Edição"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Título"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descrição"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Assunto"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Língua"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Desenhos"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabelas"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imagens"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objectos"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objectos OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Páginas"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Parágrafos"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Palavras"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Células"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caracteres"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Linhas"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definido pelo Utilizador"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informação do Documento"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Palavras-Chave"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avançado"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Estatísticas do Documento"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-pt_BR/acinclude.m4
+++ b/koffice-i18n-pt_BR/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
index ac476097..bbc08cf8 100644
--- a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
@@ -2161,19 +2161,19 @@ msgstr "Name=Documento de Texto..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Novo documento do KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informação do Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informação do Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informações do KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informações do OpenOffice.org"
 
diff --git a/koffice-i18n-pt_BR/messages/koffice/kfile_abiword.po b/koffice-i18n-pt_BR/messages/koffice/tdefile_abiword.po
index 911d65db..edf8eab3 100644
--- a/koffice-i18n-pt_BR/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-pt_BR/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# Tradução de kfile_abiword.po para Brazilian Portuguese
+# Tradução de tdefile_abiword.po para Brazilian Portuguese
 #
 # Marcus Gama <marcus.gama@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-09-25 20:11+0300\n"
 "Last-Translator: Marcus Gama <marcus.gama@gmail.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informações do Documento"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt_BR/messages/koffice/kfile_gnumeric.po b/koffice-i18n-pt_BR/messages/koffice/tdefile_gnumeric.po
index 0db52616..def30782 100644
--- a/koffice-i18n-pt_BR/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-pt_BR/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# Tradução de kfile_gnumeric.po para Brazilian Portuguese
+# Tradução de tdefile_gnumeric.po para Brazilian Portuguese
 #
 # Marcus Gama <marcus.gama@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-09-25 20:11+0300\n"
 "Last-Translator: Marcus Gama <marcus.gama@gmail.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informações do Documento"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Título"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt_BR/messages/koffice/kfile_koffice.po b/koffice-i18n-pt_BR/messages/koffice/tdefile_koffice.po
index d903bd64..4e777e41 100644
--- a/koffice-i18n-pt_BR/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-pt_BR/messages/koffice/tdefile_koffice.po
@@ -1,8 +1,8 @@
-# Tradução de kfile_koffice.po para Brazilian Portuguese
+# Tradução de tdefile_koffice.po para Brazilian Portuguese
 # Marcus Gama <marcus.gama@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2006-09-25 20:12+0300\n"
 "Last-Translator: Marcus Gama <marcus.gama@gmail.com>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informações do Documento"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Título"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Resumo"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Desconhecido*"
diff --git a/koffice-i18n-pt_BR/messages/koffice/kfile_ooo.po b/koffice-i18n-pt_BR/messages/koffice/tdefile_ooo.po
index c07c99d4..f1443850 100644
--- a/koffice-i18n-pt_BR/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-pt_BR/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
-# Tradução de kfile_ooo.po para Brazilian Portuguese
+# Tradução de tdefile_ooo.po para Brazilian Portuguese
 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 #
 # Marcus Gama <marcus_gama@uol.com.br>, 2003.
 # Marcus Gama <marcus.gama@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2006-08-29 12:05-0300\n"
 "Last-Translator: Marcus Gama <marcus.gama@gmail.com>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Impresso Por"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Data de Impressão"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Data"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Criador"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Gerador"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Editando Círculos"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Duração da Edição"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Título"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Descrição"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Assunto"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Idioma"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Desenhos"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabelas"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Imagens"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objetos"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objetos OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Páginas"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Parágrafos"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Palavras"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Células"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caracteres"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Linhas"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Definido pelo Usuário"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informações do Documento"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Palavras-chave"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Documento Avançado"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Estatísticas do Documento"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-ru/acinclude.m4
+++ b/koffice-i18n-ru/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-ru/messages/koffice/desktop_koffice.po b/koffice-i18n-ru/messages/koffice/desktop_koffice.po
index 0c845395..1e3a776a 100644
--- a/koffice-i18n-ru/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ru/messages/koffice/desktop_koffice.po
@@ -2137,19 +2137,19 @@ msgstr "Name=Текстовый документ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Новый документ KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Информация AbiWord"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Информация Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Информация KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Информация OpenOffice.org"
 
diff --git a/koffice-i18n-ru/messages/koffice/kfile_abiword.po b/koffice-i18n-ru/messages/koffice/tdefile_abiword.po
index bbeb2c59..08ab0da3 100644
--- a/koffice-i18n-ru/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-ru/messages/koffice/tdefile_abiword.po
@@ -1,10 +1,10 @@
-# KDE3 - koffice/kfile_abiword.po Russian translation.
+# KDE3 - koffice/tdefile_abiword.po Russian translation.
 # Copyright (C) 2007, KDE Russian translation team.
 # Andrey Cherepanov <sibskull@mail.ru>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2007-01-18 13:33+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Сведения о документе"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Название"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Краткий обзор"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "Неизвестный"
diff --git a/koffice-i18n-ru/messages/koffice/kfile_gnumeric.po b/koffice-i18n-ru/messages/koffice/tdefile_gnumeric.po
index 2295eccc..1b0316fd 100644
--- a/koffice-i18n-ru/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-ru/messages/koffice/tdefile_gnumeric.po
@@ -1,10 +1,10 @@
-# KDE3 - koffice/kfile_gnumeric.po Russian translation.
+# KDE3 - koffice/tdefile_gnumeric.po Russian translation.
 # Copyright (C) 2007, KDE Russian translation team.
 # Andrey Cherepanov <sibskull@mail.ru>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2007-01-18 13:33+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Сведения о документе"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Название"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Краткий обзор"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "Неизвестный"
diff --git a/koffice-i18n-ru/messages/koffice/kfile_koffice.po b/koffice-i18n-ru/messages/koffice/tdefile_koffice.po
index 1ceeee78..0670e7f7 100644
--- a/koffice-i18n-ru/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-ru/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# KDE3 - koffice/kfile_koffice.po Russian translation.
+# KDE3 - koffice/tdefile_koffice.po Russian translation.
 # Copyright (C) 2002, KDE Team.
 # Andrey Cherepanov <sibskull@mail.ru>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-01-18 13:33+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Сведения о документе"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Название"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Краткий обзор"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "Неизвестный"
diff --git a/koffice-i18n-ru/messages/koffice/kfile_ooo.po b/koffice-i18n-ru/messages/koffice/tdefile_ooo.po
index 8b54e84e..7cfb92ed 100644
--- a/koffice-i18n-ru/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-ru/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# KDE3 - koffice/kfile_ooo.po Russian translation.
+# KDE3 - koffice/tdefile_ooo.po Russian translation.
 # Copyright (C) 2003, KDE Team.
 # Andrey S. Cherepanov <sibskull@mail.ru>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-06-24 13:57+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Напечатано"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Дата печати"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Дата"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Дата создания"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Создан"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Генератор"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Циклы правки"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Время правки"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Название"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Описание"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Тема"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Язык"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Рисунков"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Таблиц"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Изображений"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Объектов"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Объектов OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Страниц"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Абзацев"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Слов"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Ячеек"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Символов"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Строк"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Определённые пользователем"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Сведения о документе"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Ключевые слова"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Расширенная информация"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Статистика документа"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-sk/acinclude.m4
+++ b/koffice-i18n-sk/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-sk/messages/koffice/desktop_koffice.po b/koffice-i18n-sk/messages/koffice/desktop_koffice.po
index 8359fd01..74f4c361 100644
--- a/koffice-i18n-sk/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sk/messages/koffice/desktop_koffice.po
@@ -2151,19 +2151,19 @@ msgstr "Name=Textový dokument KWord..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nový dokument KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informácie o KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informácie o OpenOffice.org"
 
diff --git a/koffice-i18n-sk/messages/koffice/kfile_abiword.po b/koffice-i18n-sk/messages/koffice/tdefile_abiword.po
index 64689fd4..69197d0e 100644
--- a/koffice-i18n-sk/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-sk/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Slovak
+# translation of tdefile_abiword.po to Slovak
 #
 # Richard Fric <Richard.Fric@kdemail.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-04-18 20:15+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informácie o dokumente"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titulok"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Výťah"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Neznáme*"
diff --git a/koffice-i18n-sk/messages/koffice/kfile_gnumeric.po b/koffice-i18n-sk/messages/koffice/tdefile_gnumeric.po
index 1bedf554..9f421a19 100644
--- a/koffice-i18n-sk/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-sk/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Slovak
+# translation of tdefile_gnumeric.po to Slovak
 #
 # Richard Fric <Richard.Fric@kdemail.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-04-18 20:13+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informácie o dokumente"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titulok"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Výťah"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Neznáme*"
diff --git a/koffice-i18n-sk/messages/koffice/kfile_koffice.po b/koffice-i18n-sk/messages/koffice/tdefile_koffice.po
index 9b087e34..8f8496b9 100644
--- a/koffice-i18n-sk/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-sk/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Slovak
+# translation of tdefile_koffice.po to Slovak
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-02 15:07+0200\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informácie o dokumente"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titulok"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Abstrakt"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Neznámy*"
diff --git a/koffice-i18n-sk/messages/koffice/kfile_ooo.po b/koffice-i18n-sk/messages/koffice/tdefile_ooo.po
index 23558126..e510f599 100644
--- a/koffice-i18n-sk/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-sk/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
-# translation of kfile_ooo.po to Slovak
+# translation of tdefile_ooo.po to Slovak
 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 #
 # Stanislav Visnovsky <visnovsky@kde.org>, 2003.
 # Richard Fric <Richard.Fric@kdemail.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2006-09-29 19:35+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Vytlačil"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Dátum tlače"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dátum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Dátum vytvorenia"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generátor"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cykly úprav"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Dĺžka úpravy"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titulok"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Popis"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Predmet"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Jazyk"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Kresby"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabuľky"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Obrázky"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekty"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objekty OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Stránky"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Odstavce"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Slová"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Bunky"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Znaky"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Riadky"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Užívateľské dáta"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informácie o dokumente"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Kľúčové slová"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Ďalšie informácie"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Štatistika dokumentu"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-sl/acinclude.m4
+++ b/koffice-i18n-sl/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-sl/messages/koffice/desktop_koffice.po b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
index 5007bff5..60ca6808 100644
--- a/koffice-i18n-sl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
@@ -2157,19 +2157,19 @@ msgstr "Name=Besedilni dokument ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nov dokument za KWord"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informacije o Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informacije o Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informacije o KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informacije o OpenOffice.org"
 
diff --git a/koffice-i18n-sl/messages/koffice/kfile_abiword.po b/koffice-i18n-sl/messages/koffice/tdefile_abiword.po
index 835cc1b0..ec4cb25f 100644
--- a/koffice-i18n-sl/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-sl/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Slovenian
+# translation of tdefile_abiword.po to Slovenian
 #
 # Andrej Vernekar <andrej.vernekar@moj.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-01-22 15:57+0100\n"
 "Last-Translator: Andrej Vernekar <andrej.vernekar@moj.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Avtor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Povzetek"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Neznano*"
diff --git a/koffice-i18n-sl/messages/koffice/kfile_gnumeric.po b/koffice-i18n-sl/messages/koffice/tdefile_gnumeric.po
index 6710de61..9ee70e37 100644
--- a/koffice-i18n-sl/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-sl/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Slovenian
+# translation of tdefile_gnumeric.po to Slovenian
 #
 # Andrej Vernekar <andrej.vernekar@moj.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-01-22 15:57+0100\n"
 "Last-Translator: Andrej Vernekar <andrej.vernekar@moj.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Avtor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Povzetek"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Neznano*"
diff --git a/koffice-i18n-sl/messages/koffice/kfile_koffice.po b/koffice-i18n-sl/messages/koffice/tdefile_koffice.po
index 826ce2f8..ffd90603 100644
--- a/koffice-i18n-sl/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-sl/messages/koffice/tdefile_koffice.po
@@ -1,14 +1,14 @@
-# Translation of kfile_koffice.po to Slovenian
+# Translation of tdefile_koffice.po to Slovenian
 # SLOVENIAN TRANSLATION OF KFILE_KOFFICE.
 # Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-# $Id: kfile_koffice.po 669926 2007-05-30 20:14:32Z berger $
+# $Id: tdefile_koffice.po 669926 2007-05-30 20:14:32Z berger $
 # $Source$
 # Gregor Rakar <gregor.rakar@kiss.uni-lj.si>, 2002.
 # Gregor Rakar <gregor.rakar@kiss.si>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2004-05-12 16:50+0200\n"
 "Last-Translator: Gregor Rakar <gregor.rakar@kiss.si>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Avtor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Povzetek"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Neznano*"
diff --git a/koffice-i18n-sl/messages/koffice/kfile_ooo.po b/koffice-i18n-sl/messages/koffice/tdefile_ooo.po
index 9488363d..7acc64fe 100644
--- a/koffice-i18n-sl/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-sl/messages/koffice/tdefile_ooo.po
@@ -1,12 +1,12 @@
-# translation of kfile_ooo.po to sloveanian
-# Translation of kfile_ooo.po to Slovenian
+# translation of tdefile_ooo.po to sloveanian
+# Translation of tdefile_ooo.po to Slovenian
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # Gregor Rakar <gregor.rakar@kiss.uni-lj.si>, 2003.
 # Andrej Vernekar <andrej.vernekar@moj.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-05-29 15:28+0200\n"
 "Last-Translator: Andrej Vernekar <andrej.vernekar@moj.net>\n"
@@ -16,122 +16,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Natisnil"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Datum tiskanja"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Datum ustvaritve"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Ustvarjatelj"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generator"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Urejevalni cikli"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Trajanje urejanja"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Avtor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Opis"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Predmet"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Jezik"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Risanja"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabele"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Slike"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Predmeti"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Predmeti OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Strani"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Odstavki"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Besede"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celice"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Znaki"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Vrstice"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Uporabniško določeno"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informacija o dokumentu"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Ključne besede"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Napredno o dokumentu"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistika dokumenta"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-sr/acinclude.m4
+++ b/koffice-i18n-sr/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-sr/messages/koffice/desktop_koffice.po b/koffice-i18n-sr/messages/koffice/desktop_koffice.po
index 55aac6f4..9ccbeaea 100644
--- a/koffice-i18n-sr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sr/messages/koffice/desktop_koffice.po
@@ -2150,19 +2150,19 @@ msgstr "Name=Текстуални документ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Нови KWord-ов документ:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Информације Abiword-а"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Информације Gnumeric-а"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Информације KOffice-а"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Информације OpenOffice.org-а"
 
diff --git a/koffice-i18n-sr/messages/koffice/kfile_abiword.po b/koffice-i18n-sr/messages/koffice/tdefile_abiword.po
index 469401c5..17ce7285 100644
--- a/koffice-i18n-sr/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-sr/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Serbian
+# translation of tdefile_abiword.po to Serbian
 #
 # Chusslove Illich <caslav.ilic@gmx.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-11-14 13:30+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Информације о документу"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Аутор"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Наслов"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Сажетак"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Непознато*"
diff --git a/koffice-i18n-sr/messages/koffice/kfile_gnumeric.po b/koffice-i18n-sr/messages/koffice/tdefile_gnumeric.po
index 99f80405..673eb398 100644
--- a/koffice-i18n-sr/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-sr/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Serbian
+# translation of tdefile_gnumeric.po to Serbian
 #
 # Chusslove Illich <caslav.ilic@gmx.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-11-14 13:31+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Информације о документу"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Аутор"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Наслов"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Сажетак"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Непознато*"
diff --git a/koffice-i18n-sr/messages/koffice/kfile_koffice.po b/koffice-i18n-sr/messages/koffice/tdefile_koffice.po
index cf769790..15921579 100644
--- a/koffice-i18n-sr/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-sr/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Serbian
+# translation of tdefile_koffice.po to Serbian
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Chusslove Illich <chaslav@sezampro.yu>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-08-25 10:53+0200\n"
 "Last-Translator: Chusslove Illich <chaslav@sezampro.yu>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Информације о документу"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Аутор"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Наслов"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Сажетак"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Непознато*"
diff --git a/koffice-i18n-sr/messages/koffice/kfile_ooo.po b/koffice-i18n-sr/messages/koffice/tdefile_ooo.po
index a7639355..5c141df0 100644
--- a/koffice-i18n-sr/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-sr/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
-# translation of kfile_ooo.po to Serbian
+# translation of tdefile_ooo.po to Serbian
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Chusslove Illich <chaslav@sezampro.yu>, 2003.
 # Chusslove Illich <caslav.ilic@gmx.net>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-08-21 19:40+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Штампао"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Датум штампања"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Датум"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Датум прављења"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Креатор"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Генератор"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Циклуси уређивања"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Трајање уређивања"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Наслов"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Аутор"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Опис"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Тема"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Језик"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Цртежа"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Табела"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Слика"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Објеката"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE објеката"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Страна"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Пасуса"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Речи"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Ћелија"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Знакова"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Редова"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Кориснички дефинисано"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Информације о документу"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Кључне речи"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Напредно о документу"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Статистика документа"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-sr@Latn/acinclude.m4
+++ b/koffice-i18n-sr@Latn/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
index 3b2c82b5..91271e33 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
@@ -2151,19 +2151,19 @@ msgstr "Name=Tekstualni dokument..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Novi KWord-ov dokument:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informacije Abiword-a"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informacije Gnumeric-a"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informacije KOffice-a"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informacije OpenOffice.org-a"
 
diff --git a/koffice-i18n-sr@Latn/messages/koffice/kfile_abiword.po b/koffice-i18n-sr@Latn/messages/koffice/tdefile_abiword.po
index c4012da5..be62cf84 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Serbian
+# translation of tdefile_abiword.po to Serbian
 #
 # Chusslove Illich <caslav.ilic@gmx.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-11-14 13:30+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Sažetak"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Nepoznato*"
diff --git a/koffice-i18n-sr@Latn/messages/koffice/kfile_gnumeric.po b/koffice-i18n-sr@Latn/messages/koffice/tdefile_gnumeric.po
index f11b7a18..acd2ccae 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Serbian
+# translation of tdefile_gnumeric.po to Serbian
 #
 # Chusslove Illich <caslav.ilic@gmx.net>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-11-14 13:31+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Sažetak"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Nepoznato*"
diff --git a/koffice-i18n-sr@Latn/messages/koffice/kfile_koffice.po b/koffice-i18n-sr@Latn/messages/koffice/tdefile_koffice.po
index 748d48e5..29c63fcc 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# translation of kfile_koffice.po to Serbian
+# translation of tdefile_koffice.po to Serbian
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Chusslove Illich <chaslav@sezampro.yu>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2003-08-25 10:53+0200\n"
 "Last-Translator: Chusslove Illich <chaslav@sezampro.yu>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Sažetak"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Nepoznato*"
diff --git a/koffice-i18n-sr@Latn/messages/koffice/kfile_ooo.po b/koffice-i18n-sr@Latn/messages/koffice/tdefile_ooo.po
index 91787136..17b81a96 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/tdefile_ooo.po
@@ -1,11 +1,11 @@
-# translation of kfile_ooo.po to Serbian
+# translation of tdefile_ooo.po to Serbian
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Chusslove Illich <chaslav@sezampro.yu>, 2003.
 # Chusslove Illich <caslav.ilic@gmx.net>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-08-21 19:40+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Štampao"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Datum štampanja"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Datum pravljenja"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Kreator"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Generator"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Ciklusi uređivanja"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Trajanje uređivanja"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Naslov"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Autor"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Opis"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Tema"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Jezik"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Crteža"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabela"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Slika"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekata"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE objekata"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Strana"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Pasusa"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Reči"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Ćelija"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Znakova"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Redova"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Korisnički definisano"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informacije o dokumentu"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Ključne reči"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Napredno o dokumentu"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistika dokumenta"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-sv/docs/koffice/kivio/working.docbook b/koffice-i18n-sv/docs/koffice/kivio/working.docbook
index 18ef5226..c34dfe30 100644
--- a/koffice-i18n-sv/docs/koffice/kivio/working.docbook
+++ b/koffice-i18n-sv/docs/koffice/kivio/working.docbook
@@ -202,7 +202,7 @@
 <title
 >Exportera en sida</title>
 <para
->Enskilda sidor kan exporteras som punktavbildade grafikfiler. För att exportera nuvarande sida, välj <menuchoice
+>Enskilda sidor kan exporteras som punktavbildade grafitdefiler. För att exportera nuvarande sida, välj <menuchoice
 ><guimenu
 >Arkiv</guimenu
 > <guimenuitem
diff --git a/koffice-i18n-sv/messages/koffice/desktop_koffice.po b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
index d02a071f..9a93ec41 100644
--- a/koffice-i18n-sv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
@@ -2140,19 +2140,19 @@ msgstr "Name=Textdokument..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nytt Kword-dokument"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword-information"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric-information"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Koffice-information"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Information om OpenOffice.org"
 
diff --git a/koffice-i18n-sv/messages/koffice/kfile_abiword.po b/koffice-i18n-sv/messages/koffice/tdefile_abiword.po
index 3e23469f..f21788a6 100644
--- a/koffice-i18n-sv/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-sv/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Svenska
+# translation of tdefile_abiword.po to Svenska
 # Stefan Asserhäll <stefan.asserhall@comhem.se>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-06-19 21:43+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Upphovsman"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Sammanfattning"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Okänd*"
diff --git a/koffice-i18n-sv/messages/koffice/kfile_gnumeric.po b/koffice-i18n-sv/messages/koffice/tdefile_gnumeric.po
index 00e32714..2ba9819e 100644
--- a/koffice-i18n-sv/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-sv/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Svenska
+# translation of tdefile_gnumeric.po to Svenska
 # Stefan Asserhäll <stefan.asserhall@comhem.se>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-06-19 21:43+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Upphovsman"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Sammanfattning"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Okänd*"
diff --git a/koffice-i18n-sv/messages/koffice/kfile_koffice.po b/koffice-i18n-sv/messages/koffice/tdefile_koffice.po
index 4185aee8..8d7238dd 100644
--- a/koffice-i18n-sv/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-sv/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Upphovsman"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Sammanfattning"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Okänd*"
diff --git a/koffice-i18n-sv/messages/koffice/kfile_ooo.po b/koffice-i18n-sv/messages/koffice/tdefile_ooo.po
index 1e122858..efee80da 100644
--- a/koffice-i18n-sv/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-sv/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Svenska
+# translation of tdefile_ooo.po to Svenska
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Stefan Asserhäll <stefan.asserhall@comhem.se>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-05-29 07:24+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Utskriven av"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Utskriftsdatum"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Datum"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Skapad datum"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Skapare"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Skapad av"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Redigeringscykler"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Redigeringstid"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titel"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Upphovsman"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Beskrivning"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Rubrik"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Språk"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Teckningar"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tabeller"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Bilder"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objekt"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE-objekt"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sidor"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Stycken"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Ord"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celler"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Tecken"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rader"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Användardefinierad"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Dokumentinformation"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Avancerat dokument"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Dokumentstatistik"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-tr/acinclude.m4
+++ b/koffice-i18n-tr/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-tr/messages/koffice/desktop_koffice.po b/koffice-i18n-tr/messages/koffice/desktop_koffice.po
index 3ea3ca69..a6e35ee4 100644
--- a/koffice-i18n-tr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-tr/messages/koffice/desktop_koffice.po
@@ -2207,19 +2207,19 @@ msgstr "Name=Metin Belgesi..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Yeni KWord belgesi:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword Bilgisi"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric Bilgisi"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice Bilgisi"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org Info"
 
diff --git a/koffice-i18n-tr/messages/koffice/kfile_abiword.po b/koffice-i18n-tr/messages/koffice/tdefile_abiword.po
index 0d7d48d1..832ce76d 100644
--- a/koffice-i18n-tr/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-tr/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to
+# translation of tdefile_abiword.po to
 # Görkem Çetin <gorkem@gorkemcetin.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-06-27 18:51+0300\n"
 "Last-Translator: Görkem Çetin <gorkem@gorkemcetin.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Belge Bilgisi"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Yazar"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Başlık"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Özet"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Bilinmiyor*"
diff --git a/koffice-i18n-tr/messages/koffice/kfile_gnumeric.po b/koffice-i18n-tr/messages/koffice/tdefile_gnumeric.po
index 3ac69b6c..393ddf19 100644
--- a/koffice-i18n-tr/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-tr/messages/koffice/tdefile_gnumeric.po
@@ -1,11 +1,11 @@
-# translation of kfile_gnumeric.po to Türkçe
-# translation of kfile_gnumeric.po to
+# translation of tdefile_gnumeric.po to Türkçe
+# translation of tdefile_gnumeric.po to
 # Görkem Çetin <gorkem@gorkemcetin.com>, 2005.
 # İsmail Şimşek <simsek@kde.org.tr>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-06-12 19:51+0300\n"
 "Last-Translator: İsmail Şimşek <simsek@kde.org.tr>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Belge Bilgisi"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Yazar"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Başlık"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Özet"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Bilinmiyor*"
diff --git a/koffice-i18n-tr/messages/koffice/kfile_koffice.po b/koffice-i18n-tr/messages/koffice/tdefile_koffice.po
index 12f971b4..5620fe33 100644
--- a/koffice-i18n-tr/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-tr/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Belge Bilgisi"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Yazar"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Başlık"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Ayrıcı"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Bilinmeyen*"
diff --git a/koffice-i18n-tr/messages/koffice/kfile_ooo.po b/koffice-i18n-tr/messages/koffice/tdefile_ooo.po
index b7127a37..5feb0f2d 100644
--- a/koffice-i18n-tr/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-tr/messages/koffice/tdefile_ooo.po
@@ -1,10 +1,10 @@
-# translation of kfile_ooo.po to Turkish
+# translation of tdefile_ooo.po to Turkish
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Görkem Çetin <gorkem@kde.org>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-07-22 00:53+0200\n"
 "Last-Translator: Berkin Bozdoğan <berkin@berkinbozdogan.com>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Yazdıran"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Tarihi Yazdır"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Tarih"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Oluşturulma Tarihi"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Oluşturan"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Oluşturan"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Düzenleme Devreleri"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Düzenleme Süresi"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Başlık"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Yazar"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Açıklama"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Konu"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Dil"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Çizimler"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tablolar"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Resimler"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Nesneler"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE Nesneleri"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Sayfa"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraflar"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Kelimeler"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Hücreler"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Karakterler"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Sütun"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Kullanıcı Tanımlı"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Belge Bilgisi"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Anahtar Kelimeler"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Gelişmiş Belge Bilgisi"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Belge İstatistikleri"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-uk/acinclude.m4
+++ b/koffice-i18n-uk/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-uk/messages/koffice/desktop_koffice.po b/koffice-i18n-uk/messages/koffice/desktop_koffice.po
index ea603e16..6d5fb0c4 100644
--- a/koffice-i18n-uk/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-uk/messages/koffice/desktop_koffice.po
@@ -2151,19 +2151,19 @@ msgstr "Name=Текстовий документ..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Новий документ KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Інформація Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Інформація Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Інформація KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Інформація про OpenOffice.org"
 
diff --git a/koffice-i18n-uk/messages/koffice/kfile_abiword.po b/koffice-i18n-uk/messages/koffice/tdefile_abiword.po
index 1c9aec4b..e5f871ee 100644
--- a/koffice-i18n-uk/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-uk/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Ukrainian
+# translation of tdefile_abiword.po to Ukrainian
 #
 # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-12-07 22:49-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Інформація про документ"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Заголовок"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Абстракція"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Невідомий*"
diff --git a/koffice-i18n-uk/messages/koffice/kfile_gnumeric.po b/koffice-i18n-uk/messages/koffice/tdefile_gnumeric.po
index caa2c48d..4c9e4733 100644
--- a/koffice-i18n-uk/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-uk/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Ukrainian
+# translation of tdefile_gnumeric.po to Ukrainian
 #
 # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-12-07 22:49-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Інформація про документ"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Заголовок"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Абстракція"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Невідомий*"
diff --git a/koffice-i18n-uk/messages/koffice/kfile_koffice.po b/koffice-i18n-uk/messages/koffice/tdefile_koffice.po
index 61cf2449..6db97e32 100644
--- a/koffice-i18n-uk/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-uk/messages/koffice/tdefile_koffice.po
@@ -1,8 +1,8 @@
-# Translation of kfile_koffice.po to Ukrainian
+# Translation of tdefile_koffice.po to Ukrainian
 # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2007-04-14 11:13-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Інформація про документ"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Заголовок"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Резюме"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Невідомо*"
diff --git a/koffice-i18n-uk/messages/koffice/kfile_ooo.po b/koffice-i18n-uk/messages/koffice/tdefile_ooo.po
index 52802a4c..081a6eff 100644
--- a/koffice-i18n-uk/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-uk/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Ukrainian
+# translation of tdefile_ooo.po to Ukrainian
 # Ivan Petrouchtchak <iip@telus.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-02-28 17:18-0800\n"
 "Last-Translator: Ivan Petrouchtchak <iip@telus.net>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
 "=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Надрукував"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Дата друку"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Дата"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Дата створення"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Автор"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Створено програмою"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Цикли редагування"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Тривалість редагування"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Заголовок"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Автор"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Опис"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Тема"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Мова"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Малюнків"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Таблиць"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Зображень"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Об'єктів"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Об'єктів OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Сторінок"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Абзаців"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Слів"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Комірок"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Символів"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Рядків"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Визначені користувачем"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Інформація про документ"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Ключові слова"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Додатково інформація"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Статистика документа"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
index a84ee475..e0f5e655 100644
--- a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
@@ -2191,19 +2191,19 @@ msgstr "Name=文本文档..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=新建 KWord 文档："
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword 信息"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric 信息"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice 信息"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org 信息"
 
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_abiword.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_abiword.po
index 47c68de9..3233fbb7 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_abiword.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2005-03-14 00:40+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_gnumeric.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_gnumeric.po
index 405b3ae1..f191c09f 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_gnumeric.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2005-12-09 22:57+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_koffice.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_koffice.po
index 1d8699a7..6e94e569 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_koffice.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-09-17 22:19+0800\n"
 "Last-Translator: Funda Wang<fundawang@en2china.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "作者"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "标题"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_ooo.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_ooo.po
index 6f26a9b0..066ee1e0 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_ooo.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2005-03-14 00:40+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,122 +13,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "打印者"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "打印日期"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "日期"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "创建日期"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "创建器"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "生成器"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "编辑周期"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "编辑时长"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "作者"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "描述"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "标题"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "语言"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "绘图数"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "表格数"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "图像数"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "对象数"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE 对象数"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "页数"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "段落数"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "单词数"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "单元格数"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "字符数"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "行数"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "用户定义的"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "关键字"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "文档高级"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "文档统计"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"
diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-zh_TW/acinclude.m4
+++ b/koffice-i18n-zh_TW/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
index 6169729b..68d41582 100644
--- a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
@@ -2138,19 +2138,19 @@ msgstr "Name=文字文件..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=新建 KWord 文件;"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword 資訊"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric 資訊"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice 資訊"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org 資訊"
 
diff --git a/koffice-i18n-zh_TW/messages/koffice/kfile_abiword.po b/koffice-i18n-zh_TW/messages/koffice/tdefile_abiword.po
index 3bf56ae6..b5977d7a 100644
--- a/koffice-i18n-zh_TW/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-zh_TW/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to Chinese Traditional
+# translation of tdefile_abiword.po to Chinese Traditional
 #
 # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-07-05 16:13+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "文件資訊"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "標題"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "＊未知的＊"
diff --git a/koffice-i18n-zh_TW/messages/koffice/kfile_gnumeric.po b/koffice-i18n-zh_TW/messages/koffice/tdefile_gnumeric.po
index ad4aeafb..2714b5ca 100644
--- a/koffice-i18n-zh_TW/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-zh_TW/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to Chinese Traditional
+# translation of tdefile_gnumeric.po to Chinese Traditional
 #
 # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-07-05 16:14+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "文件資訊"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "標題"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "＊未知的＊"
diff --git a/koffice-i18n-zh_TW/messages/koffice/kfile_koffice.po b/koffice-i18n-zh_TW/messages/koffice/tdefile_koffice.po
index d418ac4b..20bc8175 100644
--- a/koffice-i18n-zh_TW/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-zh_TW/messages/koffice/tdefile_koffice.po
@@ -1,10 +1,10 @@
-# traditional Chinese Translation of kfile_koffice
+# traditional Chinese Translation of tdefile_koffice
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Translator: Chao-Hsiung Liao <pesder@seed.net.tw>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2002-07-25 14:07+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder@seed.net.tw>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "文件資訊"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "作者"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "標題"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "＊未知的＊"
diff --git a/koffice-i18n-zh_TW/messages/koffice/kfile_ooo.po b/koffice-i18n-zh_TW/messages/koffice/tdefile_ooo.po
index 2c496af1..06965db9 100644
--- a/koffice-i18n-zh_TW/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-zh_TW/messages/koffice/tdefile_ooo.po
@@ -1,9 +1,9 @@
-# translation of kfile_ooo.po to Chinese Traditional
+# translation of tdefile_ooo.po to Chinese Traditional
 #
 # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2006-07-05 16:16+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
@@ -14,122 +14,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "列印由"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "列印日期"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "日期"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "建立日期"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "建立者"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "產生者"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "編輯週期"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "編輯時間"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "標題"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "作者"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "描述"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "主旨"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "語言"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "繪圖"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "表格"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "影像"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "物件"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE 物件"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "頁面"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "段落"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "單字"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "儲存格"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "字元"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "列"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "使用者定義"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "文件資訊"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "關鍵字"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "文件進階"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "文件統計"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"