From 00f56a6858b6a4b6dfb6e36a91f9e498641275ba Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:11:36 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 koffice-i18n-bg/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-bg/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-ca/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/chalk/introduction.docbook   |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-ca/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-cs/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-cy/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-cy/messages/koffice/kexi.po      |  4 +--
 koffice-i18n-da/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-da/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-de/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-de/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-el/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-el/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-en_GB/acinclude.m4               | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-es/acinclude.m4                  | 26 +++++++++----------
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-es/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-et/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-et/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-eu/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-fa/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-fa/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-fi/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-fi/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-fr/acinclude.m4                  | 26 +++++++++----------
 .../docs/koffice/koffice/index.docbook        |  4 +--
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-fr/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-ga/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-ga/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-gl/acinclude.m4                  | 26 +++++++++----------
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-gl/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-hu/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-hu/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-it/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-it/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-ja/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-ja/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-km/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-km/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-lv/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-lv/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-ms/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-nb/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-nb/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-nds/acinclude.m4                 | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-nds/messages/koffice/kplato.po   | 10 +++----
 koffice-i18n-ne/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-ne/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-nl/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-nl/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-pl/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-pl/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-pt/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-pt/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-pt_BR/acinclude.m4               | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-pt_BR/messages/koffice/kplato.po | 10 +++----
 koffice-i18n-ru/acinclude.m4                  | 26 +++++++++----------
 .../docs/koffice/koffice/index.docbook        |  4 +--
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-ru/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-sk/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-sk/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-sl/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-sl/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-sr/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-sr/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-sr@Latn/acinclude.m4             | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 .../messages/koffice/kplato.po                | 10 +++----
 koffice-i18n-sv/acinclude.m4                  | 26 +++++++++----------
 .../koffice/chalk/developers-plugins.docbook  |  2 +-
 .../docs/koffice/koffice/index.docbook        |  8 +++---
 .../docs/koffice/kword/index.docbook          |  2 +-
 .../docs/koffice/kword/table.docbook          |  2 +-
 .../{kparts.docbook => tdeparts.docbook}      |  6 ++---
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-sv/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-tr/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-tr/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-uk/acinclude.m4                  | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-uk/messages/koffice/kplato.po    | 10 +++----
 koffice-i18n-zh_CN/acinclude.m4               | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-zh_CN/messages/koffice/kplato.po | 10 +++----
 koffice-i18n-zh_TW/acinclude.m4               | 26 +++++++++----------
 .../messages/koffice/desktop_koffice.po       |  8 +++---
 koffice-i18n-zh_TW/messages/koffice/kplato.po | 10 +++----
 171 files changed, 952 insertions(+), 952 deletions(-)
 rename koffice-i18n-ca/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-da/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-de/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-es/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-et/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-fr/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-it/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-nl/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-pt/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-pt_BR/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)
 rename koffice-i18n-ru/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (98%)
 rename koffice-i18n-sv/docs/koffice/kword/{kparts.docbook => tdeparts.docbook} (97%)

diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-bg/acinclude.m4
+++ b/koffice-i18n-bg/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-bg/messages/koffice/desktop_koffice.po b/koffice-i18n-bg/messages/koffice/desktop_koffice.po
index 86da22fb..c50d5982 100644
--- a/koffice-i18n-bg/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-bg/messages/koffice/desktop_koffice.po
@@ -1644,12 +1644,12 @@ msgstr "Name=Приставка за въртене на изображение"
 msgid "Name=Screenshot"
 msgstr "Name=Снимка на екрана"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Приставка за скриптове"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Изпълнение на скриптове"
@@ -2182,11 +2182,11 @@ msgstr "GenericName=Синоними"
 msgid "Name=Print..."
 msgstr "Name=Печат..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Проверка на правописа"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Проверка на правописа"
 
diff --git a/koffice-i18n-bg/messages/koffice/kplato.po b/koffice-i18n-bg/messages/koffice/kplato.po
index 6b96453d..6afeb582 100644
--- a/koffice-i18n-bg/messages/koffice/kplato.po
+++ b/koffice-i18n-bg/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Край:"
 msgid "Effort:"
 msgstr "Усилие:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Група"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Макс. единици"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Свързани ресурси:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ca/acinclude.m4
+++ b/koffice-i18n-ca/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook
index 97a8d046..16b4e6a3 100644
--- a/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * A module that provides a star tool.
diff --git a/koffice-i18n-ca/docs/koffice/chalk/introduction.docbook b/koffice-i18n-ca/docs/koffice/chalk/introduction.docbook
index d5c2d9e7..e7c03ab8 100644
--- a/koffice-i18n-ca/docs/koffice/chalk/introduction.docbook
+++ b/koffice-i18n-ca/docs/koffice/chalk/introduction.docbook
@@ -21,7 +21,7 @@
 
 <listitem
 ><para
->Endollables: el Chalk és extensible amb els endollables. N'hi ha d'eines, espais de color, operacions de dibuix, filtres i interfícies d'usuari basades en kparts. </para
+>Endollables: el Chalk és extensible amb els endollables. N'hi ha d'eines, espais de color, operacions de dibuix, filtres i interfícies d'usuari basades en tdeparts. </para
 ></listitem>
 
 <listitem
diff --git a/koffice-i18n-ca/docs/koffice/koffice/index.docbook b/koffice-i18n-ca/docs/koffice/koffice/index.docbook
index 7c06e5a0..3ed353fd 100644
--- a/koffice-i18n-ca/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-ca/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integració</title>
 <para
->El &koffice; facilita un entorn de treball amb tots els components construïts a l'interior. Amb aquest entorn de treball s'aconsegueix una gran integració. És possible desenvolupar el vostre propi component que també hi estigui integrat. Aquesta tecnologia està descrita en profunditat al <link linkend="kparts"
+>El &koffice; facilita un entorn de treball amb tots els components construïts a l'interior. Amb aquest entorn de treball s'aconsegueix una gran integració. És possible desenvolupar el vostre propi component que també hi estigui integrat. Aquesta tecnologia està descrita en profunditat al <link linkend="tdeparts"
 >capítol sobre KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnologia del &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - els blocs de construcció del &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Usant KPart en el vostre document</title>
 
diff --git a/koffice-i18n-ca/docs/koffice/kword/index.docbook b/koffice-i18n-ca/docs/koffice/kword/index.docbook
index b51047a6..f15843d8 100644
--- a/koffice-i18n-ca/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-ca/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-ca/docs/koffice/kword/table.docbook b/koffice-i18n-ca/docs/koffice/kword/table.docbook
index 1a07dbc3..46e69906 100644
--- a/koffice-i18n-ca/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-ca/docs/koffice/kword/table.docbook
@@ -30,7 +30,7 @@
 
 <tip
 ><para
->Recordeu, si necessiteu les funcions d'un full de càlcul, podeu <link linkend="kparts"
+>Recordeu, si necessiteu les funcions d'un full de càlcul, podeu <link linkend="tdeparts"
 >encastar una taula de &kspread;</link
 > en el vostre document.</para
 ></tip>
diff --git a/koffice-i18n-ca/docs/koffice/kword/kparts.docbook b/koffice-i18n-ca/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-ca/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-ca/docs/koffice/kword/tdeparts.docbook
index 34966ac6..28412a3b 100644
--- a/koffice-i18n-ca/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-ca/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -31,7 +31,7 @@
 <para
 >Referiu-vos als fitxers d'ajuda de les altres aplicacions per a informació més específica.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Instruccions generals</title>
 <para
@@ -71,7 +71,7 @@
 >des de &kword;</emphasis
 >. Els detalls de cada aplicació són diferents. Si us plau, mireu els manuals específics de l'aplicació de &koffice; per a detalls sobre el seu ús. (En altres paraules, d'aquí en endavant, si inseriu un full de càlcul des de &kspread;, llavores les finestres actuaran de la mateixa manera que en &kspread;).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Com treballar amb el component inserit</title>
 <para
diff --git a/koffice-i18n-ca/messages/koffice/desktop_koffice.po b/koffice-i18n-ca/messages/koffice/desktop_koffice.po
index a5b264ce..5890830e 100644
--- a/koffice-i18n-ca/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ca/messages/koffice/desktop_koffice.po
@@ -1653,12 +1653,12 @@ msgstr "Name=Connector de rotació d'imatge"
 msgid "Name=Screenshot"
 msgstr "Name=Captura de pantalla"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Connector de seqüenciació"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permet l'execució de seqüències"
@@ -2197,11 +2197,11 @@ msgstr "GenericName=Paraules relacionades"
 msgid "Name=Print..."
 msgstr "Name=Imprimir..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Eina de comprovació d'ortografia"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Comprova l'ortografia d'aquesta paraula"
 
diff --git a/koffice-i18n-ca/messages/koffice/kplato.po b/koffice-i18n-ca/messages/koffice/kplato.po
index ac6580dd..c35c03b6 100644
--- a/koffice-i18n-ca/messages/koffice/kplato.po
+++ b/koffice-i18n-ca/messages/koffice/kplato.po
@@ -842,31 +842,31 @@ msgstr "Acabat:"
 msgid "Effort:"
 msgstr "Esforç:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grup"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Unitats màx."
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Assigna recursos:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-cs/acinclude.m4
+++ b/koffice-i18n-cs/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-cs/messages/koffice/desktop_koffice.po b/koffice-i18n-cs/messages/koffice/desktop_koffice.po
index 197792a8..ee98b64a 100644
--- a/koffice-i18n-cs/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-cs/messages/koffice/desktop_koffice.po
@@ -1827,13 +1827,13 @@ msgstr "Name=XML modul programu pro Kate"
 msgid "Name=Screenshot"
 msgstr "Name=KPresenter"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Test"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2404,11 +2404,11 @@ msgstr "GenericName=Podobná slova"
 msgid "Name=Print..."
 msgstr "Name=Tisk..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Nástroj pro kontrolu pravopisu"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Zkontrolovat pravopis tohoto slova"
 
diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-cy/messages/koffice/desktop_koffice.po b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
index e5d5b994..9da5ade2 100644
--- a/koffice-i18n-cy/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
@@ -1706,13 +1706,13 @@ msgstr "Name=Ategyn Paent Dyfrlliw"
 msgid "Name=Screenshot"
 msgstr "Name=Sgrinlun"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Ategyn Mudo"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2264,11 +2264,11 @@ msgstr "GenericName=Geiriau Perthnasol"
 msgid "Name=Print..."
 msgstr "Name=Argraffu..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Erfyn Cywiro Sillafu"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Cywiro Sillafu'r Gair Yma"
 
diff --git a/koffice-i18n-cy/messages/koffice/kexi.po b/koffice-i18n-cy/messages/koffice/kexi.po
index be8d3e37..31911736 100644
--- a/koffice-i18n-cy/messages/koffice/kexi.po
+++ b/koffice-i18n-cy/messages/koffice/kexi.po
@@ -7141,7 +7141,7 @@ msgstr ""
 
 #~ msgid ""
 #~ " The \"Kugar Report Generator\" is not part of Kexi, although reports are displayed within Kexi main window. It is loaded as as a plugin, but is a stand alone product licensed as GPL. There are no invocations of Kugar's internal methods.\n"
-#~ " Kexi only generates data files, which are not covered by the GPL license (FAQ at: http://www.fsf.org/copyleft/gpl.html)  and only the LGPL kparts interface is used for telling Kugar which datafile to use and to display the navigation actions. This has been approved by all (including the original) copyright holders.\n"
+#~ " Kexi only generates data files, which are not covered by the GPL license (FAQ at: http://www.fsf.org/copyleft/gpl.html)  and only the LGPL tdeparts interface is used for telling Kugar which datafile to use and to display the navigation actions. This has been approved by all (including the original) copyright holders.\n"
 #~ " \n"
 #~ " The GPL application Kugar is part of the KOffice package (www.koffice.org). The copyright/left holders known at  the time this notice is written are:\n"
 #~ " Mutiny Bay Software (info@mutinybaysoftware.com)  (Metaphrast)\n"
@@ -7151,7 +7151,7 @@ msgstr ""
 #~ "\n"
 #~ msgstr ""
 #~ "Nid rhan o Kexi ydi'r \"Creuydd Adroddiadau Kugar (Kugar Report Generator)\", er dangosir adroddiadau tu mewn i brif ffenestr Kexi.  Fe'i llwythir fel ategyn, ond cynnyrch annibynnol ydy o, wedi'i drwyddedu o dan y TGG (GPL).  Nid oes unrhyw alwadau ar ddulliau mewnol Kugar.\n"
-#~ " Dim ond cynhyrchu ffeiliau data wna Kexi, sy heb eu cynnwys o dan drwydded y GPL (Ceir FAQ yn: http://www.fsf.org/copyleft/gpl.html) a defnyddir dim ond y rhyngwyneb LGPL kparts i ddweud wrth Kugar pa ffeil ddata i'w defnyddio ac i ddangos y gweithredoedd mordwyo. Cymeradwyir hyn gan bob un o'r deiliaid hawlfraint (gan gynnwys y rhai gwreiddiol).\n"
+#~ " Dim ond cynhyrchu ffeiliau data wna Kexi, sy heb eu cynnwys o dan drwydded y GPL (Ceir FAQ yn: http://www.fsf.org/copyleft/gpl.html) a defnyddir dim ond y rhyngwyneb LGPL tdeparts i ddweud wrth Kugar pa ffeil ddata i'w defnyddio ac i ddangos y gweithredoedd mordwyo. Cymeradwyir hyn gan bob un o'r deiliaid hawlfraint (gan gynnwys y rhai gwreiddiol).\n"
 #~ "\n"
 #~ " Rhan o becyn KOffice (www.koffice.org) ydy rhaglen GPL Kugar. Deiliaid yr hawlfraint/haelfraint sy'n hysbys adeg yr ysgrifennir yr hysbysiad hwn yw:\n"
 #~ " Mutiny Bay Software (info@mutinybaysoftware.com) (Metaphrast)\n"
diff --git a/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-da/acinclude.m4
+++ b/koffice-i18n-da/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook
index 5f9da38a..cee19ccf 100644
--- a/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * En modul som sørger for et stjerneværktøj.
diff --git a/koffice-i18n-da/docs/koffice/koffice/index.docbook b/koffice-i18n-da/docs/koffice/koffice/index.docbook
index 62dbc440..8271d4c7 100644
--- a/koffice-i18n-da/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-da/docs/koffice/koffice/index.docbook
@@ -137,7 +137,7 @@
 <title
 >Integration</title>
 <para
->&koffice; sørger for et skelet som alle komponenter bygger på. Via dette skelet opnås stor integration. Det er muligt at udvikle egne komponenter som også kan integreres. Denne teknologi beskrives i større dybde i <link linkend="kparts"
+>&koffice; sørger for et skelet som alle komponenter bygger på. Via dette skelet opnås stor integration. Det er muligt at udvikle egne komponenter som også kan integreres. Denne teknologi beskrives i større dybde i <link linkend="tdeparts"
 >kapitlet om Kparts</link
 >. </para>
 </sect2>
@@ -179,11 +179,11 @@
 <title
 >&koffice;-teknologi</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - byggeblokkene for &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -228,7 +228,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Brug af KParts i dit dokument</title>
 
diff --git a/koffice-i18n-da/docs/koffice/kword/index.docbook b/koffice-i18n-da/docs/koffice/kword/index.docbook
index 9f5b9d4b..2ad93d82 100644
--- a/koffice-i18n-da/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-da/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-da/docs/koffice/kword/table.docbook b/koffice-i18n-da/docs/koffice/kword/table.docbook
index 509539b6..3bcb6db5 100644
--- a/koffice-i18n-da/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-da/docs/koffice/kword/table.docbook
@@ -30,7 +30,7 @@
 
 <tip
 ><para
->Husk, hvis du behøver funktionerne far et regneark, kan du <link linkend="kparts"
+>Husk, hvis du behøver funktionerne far et regneark, kan du <link linkend="tdeparts"
 >indsætte en &kspread;-tabel</link
 > i dokumentet.</para
 ></tip>
diff --git a/koffice-i18n-da/docs/koffice/kword/kparts.docbook b/koffice-i18n-da/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-da/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-da/docs/koffice/kword/tdeparts.docbook
index f10c84d1..0ab0a6b3 100644
--- a/koffice-i18n-da/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-da/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -31,7 +31,7 @@
 <para
 >Kig i det andet programs hjælpefil for at få detaljeret hjælp.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Generelle instruktioner</title>
 <para
@@ -71,7 +71,7 @@
 >indefra &kword;</emphasis
 >. Detaljerne for hvert program er forskellige. Læs håndbøgerne for det valgte &koffice; program for at lære mere om detaljerne i dette program. (med andre ord: herfra frem, hvis du indsætter et regneark fra &kspread; vil vinduet opføre sig på samme måde som i &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >At arbejde med den indsatte komponent.</title>
 <para
diff --git a/koffice-i18n-da/messages/koffice/desktop_koffice.po b/koffice-i18n-da/messages/koffice/desktop_koffice.po
index ff5b8670..72b23b80 100644
--- a/koffice-i18n-da/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-da/messages/koffice/desktop_koffice.po
@@ -1649,12 +1649,12 @@ msgstr "Name=Plugin for rotering af billede"
 msgid "Name=Screenshot"
 msgstr "Name=Skærmaftryk"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Scriptplugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Tillad kørsel af script"
@@ -2187,11 +2187,11 @@ msgstr "GenericName=Relaterede ord"
 msgid "Name=Print..."
 msgstr "Name=Udskriv..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Stavekontrolværktøj"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Kontrollér dette ords stavning"
 
diff --git a/koffice-i18n-da/messages/koffice/kplato.po b/koffice-i18n-da/messages/koffice/kplato.po
index d9b564cb..31777fa3 100644
--- a/koffice-i18n-da/messages/koffice/kplato.po
+++ b/koffice-i18n-da/messages/koffice/kplato.po
@@ -836,31 +836,31 @@ msgstr "Afslut:"
 msgid "Effort:"
 msgstr "Indsats:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. enheder"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Tilknyt ressourcer:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-de/acinclude.m4
+++ b/koffice-i18n-de/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook
index 22c03c2d..960f7314 100644
--- a/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * A module that provides a star tool.
diff --git a/koffice-i18n-de/docs/koffice/koffice/index.docbook b/koffice-i18n-de/docs/koffice/koffice/index.docbook
index 10333b54..2604be83 100644
--- a/koffice-i18n-de/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-de/docs/koffice/koffice/index.docbook
@@ -179,7 +179,7 @@
 <title
 >Integration</title>
 <para
->&koffice; enthält die Grundlage für alle Anwendungen. Dadurch sind alle Anwendungen gut eingebunden. Ihre eigenen Programme können Sie ebenfalls so gut integrieren. Die dazu erforderliche Technologie wird im Kapitel <link linkend="kparts"
+>&koffice; enthält die Grundlage für alle Anwendungen. Dadurch sind alle Anwendungen gut eingebunden. Ihre eigenen Programme können Sie ebenfalls so gut integrieren. Die dazu erforderliche Technologie wird im Kapitel <link linkend="tdeparts"
 >KParts</link
 > ausführlich beschrieben. </para>
 </sect2>
@@ -221,11 +221,11 @@
 <title
 >&koffice;-Technologie</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - ein wesentlicher Bestandteil von &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -270,7 +270,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >KParts in Ihrem Dokument verwenden</title>
 
diff --git a/koffice-i18n-de/docs/koffice/kword/index.docbook b/koffice-i18n-de/docs/koffice/kword/index.docbook
index 8f4e1306..15a5f161 100644
--- a/koffice-i18n-de/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-de/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-de/docs/koffice/kword/table.docbook b/koffice-i18n-de/docs/koffice/kword/table.docbook
index e81e891c..cd5a3dea 100644
--- a/koffice-i18n-de/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-de/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Sollen trotzdem Berechnungen in einer Tabelle durchgeführt werden, kann eine <link linkend="kparts"
+>Sollen trotzdem Berechnungen in einer Tabelle durchgeführt werden, kann eine <link linkend="tdeparts"
 >&kspread; Tabelle </link
 > eingebunden werden.</para
 ></tip>
diff --git a/koffice-i18n-de/docs/koffice/kword/kparts.docbook b/koffice-i18n-de/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-de/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-de/docs/koffice/kword/tdeparts.docbook
index 8a2112ae..3c19d306 100644
--- a/koffice-i18n-de/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-de/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Spezielle Informationen finden Sie in den Hilfedateien der anderen Anwendungen.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Allgemeine Anleitung</title>
 <para
@@ -91,7 +91,7 @@
 >aus &kword; heraus</emphasis
 > starten. Nutzen Sie die Handbücher zu den einzelnen &koffice;-Programmen, um die Einzelheiten ihrer Anwendung kennen zu lernen. (Mit anderen Worten: wenn Sie eine Tabellenkalkulation von &kspread; einfügen, werden sich die Fenster genauso verhalten wie in &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Mit der eingefügten Komponente arbeiten</title>
 <para
diff --git a/koffice-i18n-de/messages/koffice/desktop_koffice.po b/koffice-i18n-de/messages/koffice/desktop_koffice.po
index 510f0d45..2ff5ddfc 100644
--- a/koffice-i18n-de/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-de/messages/koffice/desktop_koffice.po
@@ -1652,12 +1652,12 @@ msgstr "Name=\"Bild rotieren\"-Plugin"
 msgid "Name=Screenshot"
 msgstr "Name=Bildschirmphoto"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Skripting-Plugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Ermöglicht das Ausführen von Skripten"
@@ -2195,11 +2195,11 @@ msgstr "GenericName=Verwandte Ausdrücke"
 msgid "Name=Print..."
 msgstr "Name=Drucken ..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Rechtschreibprüfung"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Die Schreibweise des ausgewählten Wortes überprüfen"
 
diff --git a/koffice-i18n-de/messages/koffice/kplato.po b/koffice-i18n-de/messages/koffice/kplato.po
index de91ec6e..02d6d892 100644
--- a/koffice-i18n-de/messages/koffice/kplato.po
+++ b/koffice-i18n-de/messages/koffice/kplato.po
@@ -843,31 +843,31 @@ msgstr "Ende:"
 msgid "Effort:"
 msgstr "Aufwand:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Max. Einheiten"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Ressourcen zuweisen:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-el/acinclude.m4
+++ b/koffice-i18n-el/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-el/messages/koffice/desktop_koffice.po b/koffice-i18n-el/messages/koffice/desktop_koffice.po
index 2948057b..9b8e468a 100644
--- a/koffice-i18n-el/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-el/messages/koffice/desktop_koffice.po
@@ -1663,12 +1663,12 @@ msgstr "Name=Πρόσθετο περιστροφής εικόνας"
 msgid "Name=Screenshot"
 msgstr "Name=Στιγμιότυπο οθόνης"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Πρόσθετο γραφής σεναρίων"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Επιτρέπει την εκτέλεση σεναρίων"
@@ -2207,11 +2207,11 @@ msgstr "GenericName=Συγγενικές λέξεις"
 msgid "Name=Print..."
 msgstr "Name=Εκτύπωση..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Εργαλείο ορθογραφικού ελέγχου"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Ορθογραφικός έλεγχος αυτής της λέξης"
 
diff --git a/koffice-i18n-el/messages/koffice/kplato.po b/koffice-i18n-el/messages/koffice/kplato.po
index c5e54b91..a6a2840d 100644
--- a/koffice-i18n-el/messages/koffice/kplato.po
+++ b/koffice-i18n-el/messages/koffice/kplato.po
@@ -844,31 +844,31 @@ msgstr "Τέλος:"
 msgid "Effort:"
 msgstr "Προσπάθεια:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Ομάδα"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Μέγ. μονάδες"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Ανάθεση πόρων:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-en_GB/acinclude.m4
+++ b/koffice-i18n-en_GB/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
index 9416ee13..ede2b9b4 100644
--- a/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
@@ -1678,12 +1678,12 @@ msgstr "Name=Rotate Image Plugin"
 msgid "Name=Screenshot"
 msgstr "Name=Screenshot"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Scripting plugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Allow execution of scripts"
@@ -2223,11 +2223,11 @@ msgstr "GenericName=Related Words"
 msgid "Name=Print..."
 msgstr "Name=Print..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Spell Checker Tool"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Check this Word's Spelling"
 
diff --git a/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-es/acinclude.m4
+++ b/koffice-i18n-es/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-es/docs/koffice/koffice/index.docbook b/koffice-i18n-es/docs/koffice/koffice/index.docbook
index 4daece64..28b90aec 100644
--- a/koffice-i18n-es/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-es/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integración</title>
 <para
->&koffice; proporciona un entorno común para todos los componentes. Mediante este entorno, se consigue una gran integración. También puede desarrollar su propio componente para que se integre. La tecnología que se emplea se trata en mayor profundidad en el <link linkend="kparts"
+>&koffice; proporciona un entorno común para todos los componentes. Mediante este entorno, se consigue una gran integración. También puede desarrollar su propio componente para que se integre. La tecnología que se emplea se trata en mayor profundidad en el <link linkend="tdeparts"
 >capítulo sobre KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnología de &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - los bloques de los que se compone &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -240,7 +240,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Usando KParts in du documento</title>
 
diff --git a/koffice-i18n-es/docs/koffice/kword/index.docbook b/koffice-i18n-es/docs/koffice/kword/index.docbook
index 48746203..a2efc94b 100644
--- a/koffice-i18n-es/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-es/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-es/docs/koffice/kword/table.docbook b/koffice-i18n-es/docs/koffice/kword/table.docbook
index 73f65945..ae5832bf 100644
--- a/koffice-i18n-es/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-es/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Recuerde, si necesita las funciones de una hoja de cálculo, puede <link linkend="kparts"
+>Recuerde, si necesita las funciones de una hoja de cálculo, puede <link linkend="tdeparts"
 >empotrar una tabla de &kspread;</link
 > en su documento.</para
 ></tip>
diff --git a/koffice-i18n-es/docs/koffice/kword/kparts.docbook b/koffice-i18n-es/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-es/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-es/docs/koffice/kword/tdeparts.docbook
index e4307b0c..0fc3e52b 100644
--- a/koffice-i18n-es/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-es/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Diríjase a los archivos de ayuda de las otras aplicaciones para una información más específica.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Instrucciones generales</title>
 <para
@@ -85,7 +85,7 @@
 >desde &kword;</emphasis
 >. Los detalles de cada aplicación son diferentes. Vea los manuales de la aplicación de &koffice; para detalles sobre el uso de esa aplicación. (En otras palabras, desde aquí en adelante, si inserta una hoja de cálculo desde &kspread;, entonces las ventanas actuarán de la misma que en &kspread;).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Trabajando con el componente insertado</title>
 <para
diff --git a/koffice-i18n-es/messages/koffice/desktop_koffice.po b/koffice-i18n-es/messages/koffice/desktop_koffice.po
index dc7eb2c9..f68f1129 100644
--- a/koffice-i18n-es/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-es/messages/koffice/desktop_koffice.po
@@ -1659,12 +1659,12 @@ msgstr "Name=Extensión para girar la imagen"
 msgid "Name=Screenshot"
 msgstr "Name=Captura de pantalla"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Extensión para guiones"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permite la ejecución de guiones"
@@ -2205,11 +2205,11 @@ msgstr "GenericName=Palabras relacionadas"
 msgid "Name=Print..."
 msgstr "Name=Imprimir..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Corrector ortográfico"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Comprobar la ortografía de esta palabra"
 
diff --git a/koffice-i18n-es/messages/koffice/kplato.po b/koffice-i18n-es/messages/koffice/kplato.po
index 9bb07a96..02e01d0d 100644
--- a/koffice-i18n-es/messages/koffice/kplato.po
+++ b/koffice-i18n-es/messages/koffice/kplato.po
@@ -842,31 +842,31 @@ msgstr "Finalizado:"
 msgid "Effort:"
 msgstr "Esfuerzo:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupo"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Uds. máx."
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Asignar recursos:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
index dba8d71a..faeea048 100644
--- a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * A module that provides a star tool.
diff --git a/koffice-i18n-et/docs/koffice/koffice/index.docbook b/koffice-i18n-et/docs/koffice/koffice/index.docbook
index 0d031167..5a1858ad 100644
--- a/koffice-i18n-et/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-et/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integreeritus</title>
 <para
->&koffice; pakub välja raamistiku, millele toetuvad kõik komponendid. See võimaldab neid väga suurel määral lõimida. Soovi korral võib iga kasutaja luua ka ise komponente, mis raamistikus ilusasti töötavad. Seda kirjeldab põhjalikumalt <link linkend="kparts"
+>&koffice; pakub välja raamistiku, millele toetuvad kõik komponendid. See võimaldab neid väga suurel määral lõimida. Soovi korral võib iga kasutaja luua ka ise komponente, mis raamistikus ilusasti töötavad. Seda kirjeldab põhjalikumalt <link linkend="tdeparts"
 >KPartsile pühendatud peatükk</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >&koffice;'i tehnoloogia</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - &koffice;'i ehituskivid</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -240,7 +240,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >KPartsi kasutamine dokumentides</title>
 
diff --git a/koffice-i18n-et/docs/koffice/kword/index.docbook b/koffice-i18n-et/docs/koffice/kword/index.docbook
index 58a2ec30..e31b19db 100644
--- a/koffice-i18n-et/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-et/docs/koffice/kword/table.docbook b/koffice-i18n-et/docs/koffice/kword/table.docbook
index 7829e372..3fa7a516 100644
--- a/koffice-i18n-et/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Kui sul aga peaks tekkima vajadus päris arvutustabeli järele, siis on võimalik dokumenti <link linkend="kparts"
+>Kui sul aga peaks tekkima vajadus päris arvutustabeli järele, siis on võimalik dokumenti <link linkend="tdeparts"
 >põimida  &kspread;i tabel</link
 >.</para
 ></tip>
diff --git a/koffice-i18n-et/docs/koffice/kword/kparts.docbook b/koffice-i18n-et/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-et/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-et/docs/koffice/kword/tdeparts.docbook
index 7aa9284e..b95d0be9 100644
--- a/koffice-i18n-et/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Täpsemat infot leiab vastavate rakenduste käsiraamatutest.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Üldised juhised</title>
 <para
@@ -85,7 +85,7 @@
 >&kword;i sees</emphasis
 >. Iga rakenduse korral on toimimine vastavalt rakendusele erinev. Milline täpselt, on võimalik lugeda konkreetse &koffice;'i rakenduse käsiraamatust (teisisõnu tähendab see seda, et näiteks &kspread;i töölehte lisades toimib asi sarnaselt &kspread;ile).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Lisatud komponendi kasutamine</title>
 <para
diff --git a/koffice-i18n-et/messages/koffice/desktop_koffice.po b/koffice-i18n-et/messages/koffice/desktop_koffice.po
index 0f531c77..58fe6a5c 100644
--- a/koffice-i18n-et/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-et/messages/koffice/desktop_koffice.po
@@ -1637,12 +1637,12 @@ msgstr "Name=Pildi pööramise plugin"
 msgid "Name=Screenshot"
 msgstr "Name=Ekraanipilt"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Skriptiplugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Võimaldab skriptide käivitamist"
@@ -2174,11 +2174,11 @@ msgstr "GenericName=Sarnased sõnad"
 msgid "Name=Print..."
 msgstr "Name=Trükkimine..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Õigekirja kontroll"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Selle sõna õigekirja kontrollimine"
 
diff --git a/koffice-i18n-et/messages/koffice/kplato.po b/koffice-i18n-et/messages/koffice/kplato.po
index 3df7a79e..e411e755 100644
--- a/koffice-i18n-et/messages/koffice/kplato.po
+++ b/koffice-i18n-et/messages/koffice/kplato.po
@@ -831,31 +831,31 @@ msgstr "Lõpp:"
 msgid "Effort:"
 msgstr "Ajakulu:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupp"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. üksusi"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Omistatakse ressursid:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-eu/acinclude.m4
+++ b/koffice-i18n-eu/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-eu/messages/koffice/desktop_koffice.po b/koffice-i18n-eu/messages/koffice/desktop_koffice.po
index 2c955978..17043294 100644
--- a/koffice-i18n-eu/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-eu/messages/koffice/desktop_koffice.po
@@ -1763,13 +1763,13 @@ msgstr "Name=Akuarelazko margoen plugina"
 msgid "Name=Screenshot"
 msgstr "Name=KPresenter"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Migraziorako plugina"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2330,11 +2330,11 @@ msgstr "GenericName=Erlazionatutako hitzak"
 msgid "Name=Print..."
 msgstr "Name=Inprimatu..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Egiaztapen ortografikorako tresna"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Egiaztatu hitz honen ortografia"
 
diff --git a/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-fa/acinclude.m4
+++ b/koffice-i18n-fa/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-fa/messages/koffice/desktop_koffice.po b/koffice-i18n-fa/messages/koffice/desktop_koffice.po
index cee94ac6..ff52bc44 100644
--- a/koffice-i18n-fa/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fa/messages/koffice/desktop_koffice.po
@@ -1637,12 +1637,12 @@ msgstr "Name=چرخش وصلۀ تصویر"
 msgid "Name=Screenshot"
 msgstr "Name=تصویر پرده"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=وصلۀ دست‌نوشته"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=اجازۀ اجرای دست‌نوشته‌ها"
@@ -2176,11 +2176,11 @@ msgstr "GenericName=واژه‌های مربوط"
 msgid "Name=Print..."
 msgstr "Name=چاپ..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=ابزار غلط‌گیر"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=بررسی هجی این واژه"
 
diff --git a/koffice-i18n-fa/messages/koffice/kplato.po b/koffice-i18n-fa/messages/koffice/kplato.po
index ac7d1dd6..507204f4 100644
--- a/koffice-i18n-fa/messages/koffice/kplato.po
+++ b/koffice-i18n-fa/messages/koffice/kplato.po
@@ -831,31 +831,31 @@ msgstr "پایان:"
 msgid "Effort:"
 msgstr "تلاش:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "گروه"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "واحدهای بیشینه"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "انتساب منابع:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-fi/acinclude.m4
+++ b/koffice-i18n-fi/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-fi/messages/koffice/desktop_koffice.po b/koffice-i18n-fi/messages/koffice/desktop_koffice.po
index 6bb89bea..e21054ca 100644
--- a/koffice-i18n-fi/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fi/messages/koffice/desktop_koffice.po
@@ -1699,13 +1699,13 @@ msgstr "Name=Vesivärikuvaliitännäinen"
 msgid "Name=Screenshot"
 msgstr "Name=KPresenter"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Yhdistämisliitännäinen"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2266,11 +2266,11 @@ msgstr "GenericName=Samankaltaiset sanat"
 msgid "Name=Print..."
 msgstr "Name=Tulosta..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Oikolukutyökalu"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Tarkista tämän sanan kirjoitusasu"
 
diff --git a/koffice-i18n-fi/messages/koffice/kplato.po b/koffice-i18n-fi/messages/koffice/kplato.po
index 88422974..2f8b6190 100644
--- a/koffice-i18n-fi/messages/koffice/kplato.po
+++ b/koffice-i18n-fi/messages/koffice/kplato.po
@@ -805,31 +805,31 @@ msgstr "Loppu:"
 msgid "Effort:"
 msgstr "Ponnistus:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Ryhmä"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Enint. yksikköä"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Liitetyt resurssit"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-fr/docs/koffice/koffice/index.docbook b/koffice-i18n-fr/docs/koffice/koffice/index.docbook
index 20bd073e..40b4b1aa 100644
--- a/koffice-i18n-fr/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-fr/docs/koffice/koffice/index.docbook
@@ -94,7 +94,7 @@
 </chapter
 > 
 
-<chapter id="kparts">
+<chapter id="tdeparts">
 <title
 >KParts - les blocs constitutifs de &koffice;</title>
 
@@ -134,7 +134,7 @@
 </sect1>
 
 
-<sect1 id="kparts-try-it">
+<sect1 id="tdeparts-try-it">
 <title
 >Utiliser KParts dans votre document</title>
 
diff --git a/koffice-i18n-fr/docs/koffice/kword/table.docbook b/koffice-i18n-fr/docs/koffice/kword/table.docbook
index dc70b67f..456dff77 100644
--- a/koffice-i18n-fr/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-fr/docs/koffice/kword/table.docbook
@@ -30,7 +30,7 @@
 
 <tip
 ><para
->Si vous avez besoin des fonctions d'un tableur, vous pouvez <link linkend="kparts"
+>Si vous avez besoin des fonctions d'un tableur, vous pouvez <link linkend="tdeparts"
 >Intégrer un tableur &kspread;</link
 > dans votre document.</para
 ></tip>
diff --git a/koffice-i18n-fr/docs/koffice/kword/kparts.docbook b/koffice-i18n-fr/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-fr/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-fr/docs/koffice/kword/tdeparts.docbook
index 4b6d5b07..21814c6c 100644
--- a/koffice-i18n-fr/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-fr/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -31,7 +31,7 @@
 <para
 >Référez-vous aux fichiers d'aide des autres applications pour plus d'informations spécifiques.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Instructions générales</title>
 <para
@@ -71,7 +71,7 @@
 >depuis l'intérieur de &kword;</emphasis
 >. Les détails de chaque application sont différents. S'il vous plaît, regardez les manuels d'application pour l'application spécifique de &koffice; pour les détails de l'utilisation de cette application (en d'autres mots, si vous insérez un tableur de &kspread;, les fenêtres agiront de la même manière que &kspread;).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Travailler avec le composant inséré.</title>
 <para
diff --git a/koffice-i18n-fr/messages/koffice/desktop_koffice.po b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
index 5b5d10c2..d9382222 100644
--- a/koffice-i18n-fr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
@@ -1662,12 +1662,12 @@ msgstr "Name=Module de rotation d'images"
 msgid "Name=Screenshot"
 msgstr "Name=Capture d'écran"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Module de scriptage"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permet d'exécuter des scripts"
@@ -2206,11 +2206,11 @@ msgstr "GenericName=Mots liés"
 msgid "Name=Print..."
 msgstr "Name=Impression..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Vérificateur orthographique"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Vérifier l'orthographe de ce mot"
 
diff --git a/koffice-i18n-fr/messages/koffice/kplato.po b/koffice-i18n-fr/messages/koffice/kplato.po
index a2160f01..88a65f76 100644
--- a/koffice-i18n-fr/messages/koffice/kplato.po
+++ b/koffice-i18n-fr/messages/koffice/kplato.po
@@ -843,31 +843,31 @@ msgstr "Terminé :"
 msgid "Effort:"
 msgstr "Effort :"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Groupe"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Unités max."
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Affecter des ressources :"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ga/acinclude.m4
+++ b/koffice-i18n-ga/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ga/messages/koffice/desktop_koffice.po b/koffice-i18n-ga/messages/koffice/desktop_koffice.po
index 3a8c5367..db6e4831 100644
--- a/koffice-i18n-ga/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ga/messages/koffice/desktop_koffice.po
@@ -1627,12 +1627,12 @@ msgstr ""
 msgid "Name=Screenshot"
 msgstr "Name=Seat den Scáileán"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Breiseán scriptithe"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr ""
@@ -2156,11 +2156,11 @@ msgstr ""
 msgid "Name=Print..."
 msgstr "Name=Priontáil..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr ""
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr ""
 
diff --git a/koffice-i18n-ga/messages/koffice/kplato.po b/koffice-i18n-ga/messages/koffice/kplato.po
index 7ff34bae..f0b3cd50 100644
--- a/koffice-i18n-ga/messages/koffice/kplato.po
+++ b/koffice-i18n-ga/messages/koffice/kplato.po
@@ -793,31 +793,31 @@ msgstr "Críochnaigh:"
 msgid "Effort:"
 msgstr "Saothar:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grúpa"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Sann acmhainní:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-gl/acinclude.m4
+++ b/koffice-i18n-gl/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-gl/docs/koffice/koffice/index.docbook b/koffice-i18n-gl/docs/koffice/koffice/index.docbook
index c4e15d2f..cdcf0dae 100644
--- a/koffice-i18n-gl/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-gl/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integración</title>
 <para
->&koffice; fornece un framework que todos os seus programas usan. Mediante este framework acádase unha grande integración. É posíbel desenvolver a súa propria componente que se integre por igual. A tecnoloxía para isto é descrita con maior detalle no <link linkend="kparts"
+>&koffice; fornece un framework que todos os seus programas usan. Mediante este framework acádase unha grande integración. É posíbel desenvolver a súa propria componente que se integre por igual. A tecnoloxía para isto é descrita con maior detalle no <link linkend="tdeparts"
 >capítulo acerca das KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnoloxía de &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - os tixolos cos que se construi &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Uso de KParts nos seus documentos</title>
 
diff --git a/koffice-i18n-gl/messages/koffice/desktop_koffice.po b/koffice-i18n-gl/messages/koffice/desktop_koffice.po
index 6db2b5fc..4ff3bbb7 100644
--- a/koffice-i18n-gl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-gl/messages/koffice/desktop_koffice.po
@@ -1655,12 +1655,12 @@ msgstr "Name=Plugin para Rodar a Imaxe"
 msgid "Name=Screenshot"
 msgstr "Name=Captura de Pantalla"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Plugin de programación"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permite executar guións"
@@ -2200,11 +2200,11 @@ msgstr "GenericName=Palabras Relacionadas"
 msgid "Name=Print..."
 msgstr "Name=Imprimir..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Verificador Ortográfico"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Verifica a Ortografía desta Palabra"
 
diff --git a/koffice-i18n-gl/messages/koffice/kplato.po b/koffice-i18n-gl/messages/koffice/kplato.po
index 6c4adef3..886d94be 100644
--- a/koffice-i18n-gl/messages/koffice/kplato.po
+++ b/koffice-i18n-gl/messages/koffice/kplato.po
@@ -838,31 +838,31 @@ msgstr "Fín:"
 msgid "Effort:"
 msgstr "Esforzo:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupo"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Máx. de Unidades"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Asinar recursos:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-hu/acinclude.m4
+++ b/koffice-i18n-hu/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-hu/messages/koffice/desktop_koffice.po b/koffice-i18n-hu/messages/koffice/desktop_koffice.po
index b70692da..334aab0e 100644
--- a/koffice-i18n-hu/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-hu/messages/koffice/desktop_koffice.po
@@ -1632,12 +1632,12 @@ msgstr "Name=Képelforgató modul"
 msgid "Name=Screenshot"
 msgstr "Name=Képernyőfelvétel"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Szkript modul"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Lehetővé teszi szkriptek végrehajtását"
@@ -2172,11 +2172,11 @@ msgstr "GenericName=Szinonimaszótár"
 msgid "Name=Print..."
 msgstr "Name=Nyomtatás..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Helyesírás-ellenőrző"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=A szó helyesírásának ellenőrzése"
 
diff --git a/koffice-i18n-hu/messages/koffice/kplato.po b/koffice-i18n-hu/messages/koffice/kplato.po
index ff56d2e7..3bc2a508 100644
--- a/koffice-i18n-hu/messages/koffice/kplato.po
+++ b/koffice-i18n-hu/messages/koffice/kplato.po
@@ -833,31 +833,31 @@ msgstr "Befejezés:"
 msgid "Effort:"
 msgstr "Ráfordítás:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Csoport"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Az egységek max. száma"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Erőforrások hozzárendelése:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-it/acinclude.m4
+++ b/koffice-i18n-it/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook
index c1a3de71..542fada0 100644
--- a/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * Un modulo che fornisce uno strumento stella*/
diff --git a/koffice-i18n-it/docs/koffice/koffice/index.docbook b/koffice-i18n-it/docs/koffice/koffice/index.docbook
index 887f3d78..e26087b5 100644
--- a/koffice-i18n-it/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-it/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integrazione</title>
 <para
->&koffice; fornisce un'infrastruttura su cui vengono montati tutti i componenti. Attraverso questa infrastruttura si ottiene una elevata integrazione. È possibile sviluppare anche dei propri componenti, a loro volta integrabili. Questa tecnologia viene descritta in maggior profondità nel <link linkend="kparts"
+>&koffice; fornisce un'infrastruttura su cui vengono montati tutti i componenti. Attraverso questa infrastruttura si ottiene una elevata integrazione. È possibile sviluppare anche dei propri componenti, a loro volta integrabili. Questa tecnologia viene descritta in maggior profondità nel <link linkend="tdeparts"
 >capitolo su KPart</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnologia di &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KPart - i mattoni di &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Usare i KPart nel tuo documento</title>
 
diff --git a/koffice-i18n-it/docs/koffice/kword/index.docbook b/koffice-i18n-it/docs/koffice/kword/index.docbook
index 5f619ced..7a683aa3 100644
--- a/koffice-i18n-it/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-it/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-it/docs/koffice/kword/table.docbook b/koffice-i18n-it/docs/koffice/kword/table.docbook
index 0592fcf6..abc3b10f 100644
--- a/koffice-i18n-it/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-it/docs/koffice/kword/table.docbook
@@ -52,7 +52,7 @@
 
 <tip
 ><para
->Ricordati che se hai bisogno delle funzioni di un foglio di calcolo, puoi <link linkend="kparts"
+>Ricordati che se hai bisogno delle funzioni di un foglio di calcolo, puoi <link linkend="tdeparts"
 >includere una tabella di &kspread;</link
 > nel documento.</para
 ></tip>
diff --git a/koffice-i18n-it/docs/koffice/kword/kparts.docbook b/koffice-i18n-it/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-it/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-it/docs/koffice/kword/tdeparts.docbook
index 6c347133..6125158d 100644
--- a/koffice-i18n-it/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-it/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -53,7 +53,7 @@
 <para
 >Fai riferimento ai file di aiuto delle altre applicazioni per informazioni più specifiche.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Istruzioni generali</title>
 <para
@@ -93,7 +93,7 @@
 >all'interno di &kword;</emphasis
 >. I particolari per ogni applicazione sono diversi. Consulta il manuale del particolare programma di &koffice; per i dettagli sul suo uso (in altre parole, da qui in avanti, se inserisci un foglio di calcolo da &kspread;, la finestra funzionerà come quella di &kspread;).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Lavorare con il componente inserito</title>
 <para
diff --git a/koffice-i18n-it/messages/koffice/desktop_koffice.po b/koffice-i18n-it/messages/koffice/desktop_koffice.po
index dc790932..8f6281a7 100644
--- a/koffice-i18n-it/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-it/messages/koffice/desktop_koffice.po
@@ -1651,12 +1651,12 @@ msgstr "Name=Plugin per ruotare le immagini"
 msgid "Name=Screenshot"
 msgstr "Name=Schermata"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Plugin di scripting"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permette di eseguire script"
@@ -2196,11 +2196,11 @@ msgstr "GenericName=Dizionario dei sinonimi"
 msgid "Name=Print..."
 msgstr "Name=Stampa..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Correttore ortografico"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Controlla l'ortografia di questa parola"
 
diff --git a/koffice-i18n-it/messages/koffice/kplato.po b/koffice-i18n-it/messages/koffice/kplato.po
index e220d095..bac7727e 100644
--- a/koffice-i18n-it/messages/koffice/kplato.po
+++ b/koffice-i18n-it/messages/koffice/kplato.po
@@ -848,31 +848,31 @@ msgstr "Fine:"
 msgid "Effort:"
 msgstr "Lavoro:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Gruppo"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Unità massime"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Assegna risorse:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ja/acinclude.m4
+++ b/koffice-i18n-ja/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ja/messages/koffice/desktop_koffice.po b/koffice-i18n-ja/messages/koffice/desktop_koffice.po
index 4d469795..033a0ae8 100644
--- a/koffice-i18n-ja/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ja/messages/koffice/desktop_koffice.po
@@ -1631,12 +1631,12 @@ msgstr "Name=画像回転プラグイン"
 msgid "Name=Screenshot"
 msgstr "Name=スクリーンショット"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=スクリプトプラグイン"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=スクリプトの実行を可能にします"
@@ -2163,11 +2163,11 @@ msgstr "GenericName=類義語"
 msgid "Name=Print..."
 msgstr "Name=印刷..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=スペルチェックツール"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=単語のスペルチェック"
 
diff --git a/koffice-i18n-ja/messages/koffice/kplato.po b/koffice-i18n-ja/messages/koffice/kplato.po
index 7182fcc1..8df4eb9b 100644
--- a/koffice-i18n-ja/messages/koffice/kplato.po
+++ b/koffice-i18n-ja/messages/koffice/kplato.po
@@ -810,31 +810,31 @@ msgstr "完了:"
 msgid "Effort:"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "グループ"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "リソースを割り当て:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4
index e42bfe09..b3e654ce 100644
--- a/koffice-i18n-km/acinclude.m4
+++ b/koffice-i18n-km/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-km/messages/koffice/desktop_koffice.po b/koffice-i18n-km/messages/koffice/desktop_koffice.po
index 706729b3..9df62182 100644
--- a/koffice-i18n-km/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-km/messages/koffice/desktop_koffice.po
@@ -1632,12 +1632,12 @@ msgstr "Name=កម្មវិធី​ត្រឡប់​រូបភាព"
 msgid "Name=Screenshot"
 msgstr "Name=រូបថត​អេក្រង់"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=កម្មវិធី​ជំនួយ​សម្រាប់​ស្គ្រីប"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:36
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:36
 #: kspread/plugins/scripting/kspreadscripting.desktop:36
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=អនុញ្ញាត​ឲ្យ​ប្រតិបត្តិ​ស្គ្រីប"
@@ -2173,11 +2173,11 @@ msgstr "GenericName=ពាក្យ​ដែល​ទាក់ទង"
 msgid "Name=Print..."
 msgstr "Name=បោះពុម្ព​..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=ឧបករណ៍​ពិនិត្យ​អក្ខរាវិរុទ្ធ"
 
-#: tools/spell/kspelltool.desktop:70
+#: tools/spell/tdespelltool.desktop:70
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=ពិនិត្យ​អក្ខរាវិរុទ្ធ​របស់​ពាក្យ​នេះ"
 
diff --git a/koffice-i18n-km/messages/koffice/kplato.po b/koffice-i18n-km/messages/koffice/kplato.po
index 4d18341e..c5f8b0ec 100644
--- a/koffice-i18n-km/messages/koffice/kplato.po
+++ b/koffice-i18n-km/messages/koffice/kplato.po
@@ -842,31 +842,31 @@ msgstr "បញ្ចប់ ៖"
 msgid "Effort:"
 msgstr "កិច្ចប្រឹងប្រែង ៖"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "ក្រុម"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "ឯកតាអតិ."
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "ផ្ដល់​ធនធាន ៖"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-lv/messages/koffice/desktop_koffice.po b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
index a8fb4036..e199776a 100644
--- a/koffice-i18n-lv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
@@ -1814,13 +1814,13 @@ msgstr "Name=Atklāts"
 msgid "Name=Screenshot"
 msgstr "Name=Ekrāns"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Atklāts"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:31
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:31
 #: kspread/plugins/scripting/kspreadscripting.desktop:31
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2403,11 +2403,11 @@ msgstr "GenericName=Saistītie Vārdi"
 msgid "Name=Print..."
 msgstr "Name=Drukāt..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Pareizrakstības pārbaudes rīks"
 
-#: tools/spell/kspelltool.desktop:68
+#: tools/spell/tdespelltool.desktop:68
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Pārbaudīt ??o Vārdu Pareizrakstību"
 
diff --git a/koffice-i18n-lv/messages/koffice/kplato.po b/koffice-i18n-lv/messages/koffice/kplato.po
index 10ee8509..19035a09 100644
--- a/koffice-i18n-lv/messages/koffice/kplato.po
+++ b/koffice-i18n-lv/messages/koffice/kplato.po
@@ -794,31 +794,31 @@ msgstr "Beigt ne Vēlāk Kā"
 msgid "Effort:"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, fuzzy, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "Resursa vārds:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, fuzzy, no-c-format
 msgid "Group"
 msgstr "Grupa:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, fuzzy, no-c-format
 msgid "Assign resources:"
 msgstr "Labot Resursu"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, fuzzy, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ms/acinclude.m4
+++ b/koffice-i18n-ms/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ms/messages/koffice/desktop_koffice.po b/koffice-i18n-ms/messages/koffice/desktop_koffice.po
index a99b5a1f..53364054 100644
--- a/koffice-i18n-ms/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ms/messages/koffice/desktop_koffice.po
@@ -1756,13 +1756,13 @@ msgstr "Name=Plugin Warna Cat Air "
 msgid "Name=Screenshot"
 msgstr "Name=KPresenter"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Plugin Migrasi"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2320,11 +2320,11 @@ msgstr "GenericName=Kata Berkaitan "
 msgid "Name=Print..."
 msgstr "Name=Cetak..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Alat Penyemak Eja"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Semak Ejaan Kata ini"
 
diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-nb/acinclude.m4
+++ b/koffice-i18n-nb/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-nb/messages/koffice/desktop_koffice.po b/koffice-i18n-nb/messages/koffice/desktop_koffice.po
index 74ed622c..f86675fd 100644
--- a/koffice-i18n-nb/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nb/messages/koffice/desktop_koffice.po
@@ -1646,12 +1646,12 @@ msgstr "Name=Programtillegg for bilderotering"
 msgid "Name=Screenshot"
 msgstr "Name=Skjermbilde"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Programtillegg for skripting"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Tillater skriptkjøring"
@@ -2184,11 +2184,11 @@ msgstr "GenericName=Beslektede ord"
 msgid "Name=Print..."
 msgstr "Name=Skriv ut ..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Stavekontrollverktøy"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Sjekk stavingen av dette ordet"
 
diff --git a/koffice-i18n-nb/messages/koffice/kplato.po b/koffice-i18n-nb/messages/koffice/kplato.po
index c8df0379..33294474 100644
--- a/koffice-i18n-nb/messages/koffice/kplato.po
+++ b/koffice-i18n-nb/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Avslutt:"
 msgid "Effort:"
 msgstr "Innsats:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. enheter"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Tilordne ressurser:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-nds/acinclude.m4
+++ b/koffice-i18n-nds/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-nds/messages/koffice/desktop_koffice.po b/koffice-i18n-nds/messages/koffice/desktop_koffice.po
index 189170a9..8085152a 100644
--- a/koffice-i18n-nds/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nds/messages/koffice/desktop_koffice.po
@@ -1638,12 +1638,12 @@ msgstr "Name=Moduul för't Bilddreihen"
 msgid "Name=Screenshot"
 msgstr "Name=Schirmbild"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Skriptmoduul"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Skripten utföhren"
@@ -2175,11 +2175,11 @@ msgstr "GenericName=Tohören Wöör"
 msgid "Name=Print..."
 msgstr "Name=Drucken..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Klookschriever"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Dit Woort op Schrieffehlers kuntrulleren"
 
diff --git a/koffice-i18n-nds/messages/koffice/kplato.po b/koffice-i18n-nds/messages/koffice/kplato.po
index d920637c..a18985d7 100644
--- a/koffice-i18n-nds/messages/koffice/kplato.po
+++ b/koffice-i18n-nds/messages/koffice/kplato.po
@@ -837,31 +837,31 @@ msgstr "Enn:"
 msgid "Effort:"
 msgstr "Leisten:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Koppel"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Max. Eenheiten"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Ressourcen towiesen:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ne/acinclude.m4
+++ b/koffice-i18n-ne/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ne/messages/koffice/desktop_koffice.po b/koffice-i18n-ne/messages/koffice/desktop_koffice.po
index bac6909d..f1faba8b 100644
--- a/koffice-i18n-ne/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ne/messages/koffice/desktop_koffice.po
@@ -1648,12 +1648,12 @@ msgstr "Name=छवि प्लगइन परिक्रमा गर्न
 msgid "Name=Screenshot"
 msgstr "Name=स्क्रिनसट"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=प्लगइन स्क्रिप्ट गर्दै"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=स्क्रिप्टको कार्यान्वयनलाई अनुमति दिनुहोस्"
@@ -2189,11 +2189,11 @@ msgstr "GenericName=सम्बन्धित शब्दहरू"
 msgid "Name=Print..."
 msgstr "Name=मुद्रण गर्नुहोस्..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=हिज्जे परीक्षक उपकरण"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=यो शब्दको हिज्जे जाँच गर्नुहोस्"
 
diff --git a/koffice-i18n-ne/messages/koffice/kplato.po b/koffice-i18n-ne/messages/koffice/kplato.po
index b3695071..067d5044 100644
--- a/koffice-i18n-ne/messages/koffice/kplato.po
+++ b/koffice-i18n-ne/messages/koffice/kplato.po
@@ -833,31 +833,31 @@ msgstr "समाप्त:"
 msgid "Effort:"
 msgstr "प्रयास:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "कार्य संसाधान प्यानल आधार"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "समूह"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "अधिकतम एकाई"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "संसाधन मानाङ्कन गर्नुहोस्:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-nl/acinclude.m4
+++ b/koffice-i18n-nl/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook
index 492a299a..876e40ac 100644
--- a/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook
@@ -292,7 +292,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * A module that provides a star tool.
diff --git a/koffice-i18n-nl/docs/koffice/koffice/index.docbook b/koffice-i18n-nl/docs/koffice/koffice/index.docbook
index 96808c21..bcb9f326 100644
--- a/koffice-i18n-nl/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-nl/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integratie</title>
 <para
->&koffice; bestaat uit een raamwerk (framework) waar alle componenten op gebouwd zijn. Dit raamwerk zorgt voor een hoge mate van integratie. U kunt zelf componenten ontwikkelen die even goed geïntegreerd worden. Gedetailleerde informatie hierover kunt u vinden in het <link linkend="kparts"
+>&koffice; bestaat uit een raamwerk (framework) waar alle componenten op gebouwd zijn. Dit raamwerk zorgt voor een hoge mate van integratie. U kunt zelf componenten ontwikkelen die even goed geïntegreerd worden. Gedetailleerde informatie hierover kunt u vinden in het <link linkend="tdeparts"
 >hoofdstuk over KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >De technologie van &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - de bouwstenen van &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -244,7 +244,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >KParts in uw documenten gebruiken</title>
 
diff --git a/koffice-i18n-nl/docs/koffice/kword/index.docbook b/koffice-i18n-nl/docs/koffice/kword/index.docbook
index e3ab5ae4..e46cd8b5 100644
--- a/koffice-i18n-nl/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-nl/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-nl/docs/koffice/kword/table.docbook b/koffice-i18n-nl/docs/koffice/kword/table.docbook
index 5643cda6..b2dc17e6 100644
--- a/koffice-i18n-nl/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-nl/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Als u de functies van een rekenblad nodig hebt, kunt u <link linkend="kparts"
+>Als u de functies van een rekenblad nodig hebt, kunt u <link linkend="tdeparts"
 >een &kspread;-tabel inbedden</link
 > in het document.</para
 ></tip>
diff --git a/koffice-i18n-nl/docs/koffice/kword/kparts.docbook b/koffice-i18n-nl/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-nl/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-nl/docs/koffice/kword/tdeparts.docbook
index 005d671e..f34b662c 100644
--- a/koffice-i18n-nl/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-nl/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Specifieke informatie over de andere toepassingen kunt u vinden in de documentatie van die toepassingen.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Algemene aanwijzingen</title>
 <para
@@ -85,7 +85,7 @@
 >vanuit &kword;</emphasis
 >. Informatie over het werken met de toepassing kunt u vinden in de documentatie van die toepassing. Als u een rekenblad van &kspread; invoegt, zal het objectframe hetzelfde werken als &kspread;.</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Met ingevoegde objecten werken</title>
 <para
diff --git a/koffice-i18n-nl/messages/koffice/desktop_koffice.po b/koffice-i18n-nl/messages/koffice/desktop_koffice.po
index 73792220..4a3b4593 100644
--- a/koffice-i18n-nl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-nl/messages/koffice/desktop_koffice.po
@@ -1660,12 +1660,12 @@ msgstr "Name=Plugin voor afbeeldingrotatie"
 msgid "Name=Screenshot"
 msgstr "Name=Schermafbeelding"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Scriptplugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Hiermee kunnen scripts uitgevoerd worden"
@@ -2201,11 +2201,11 @@ msgstr "GenericName=Gerelateerde woorden"
 msgid "Name=Print..."
 msgstr "Name=Afdrukken..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Spellingcontrole"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Controleer de spelling van dit woord"
 
diff --git a/koffice-i18n-nl/messages/koffice/kplato.po b/koffice-i18n-nl/messages/koffice/kplato.po
index c1cce9f2..168f9c31 100644
--- a/koffice-i18n-nl/messages/koffice/kplato.po
+++ b/koffice-i18n-nl/messages/koffice/kplato.po
@@ -847,31 +847,31 @@ msgstr "Voltooid:"
 msgid "Effort:"
 msgstr "Inspanning:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaakHulpbronnenPaneelBasis"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Groep"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Max. aant. eenheden"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Hulpbronnen toewijzen:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-pl/acinclude.m4
+++ b/koffice-i18n-pl/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-pl/messages/koffice/desktop_koffice.po b/koffice-i18n-pl/messages/koffice/desktop_koffice.po
index 35367669..3f8bafea 100644
--- a/koffice-i18n-pl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pl/messages/koffice/desktop_koffice.po
@@ -1661,12 +1661,12 @@ msgstr "Name=Wtyczka obrotu obrazków"
 msgid "Name=Screenshot"
 msgstr "Name=Zrzut ekranu"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Wtyczka obsługi języków skryptowych"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Zezwala na wykonywanie skryptów"
@@ -2203,11 +2203,11 @@ msgstr "GenericName=Słowa pokrewne"
 msgid "Name=Print..."
 msgstr "Name=Drukuj..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Narzędzie sprawdzania pisowni"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Sprawdź poprawność pisowni tego słowa"
 
diff --git a/koffice-i18n-pl/messages/koffice/kplato.po b/koffice-i18n-pl/messages/koffice/kplato.po
index e40a2d89..ecc3b077 100644
--- a/koffice-i18n-pl/messages/koffice/kplato.po
+++ b/koffice-i18n-pl/messages/koffice/kplato.po
@@ -835,31 +835,31 @@ msgstr "Zakończenie:"
 msgid "Effort:"
 msgstr "Wysiłek:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupa"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. jednostek"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Przydziel zasoby:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-pt/acinclude.m4
+++ b/koffice-i18n-pt/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook
index c88bbb89..73f185a2 100644
--- a/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef FERRAMENTA_ESTRELA_H_
 #define FERRAMENTA_ESTRELA_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * Um módulo que oferece uma ferramenta de estrela.
diff --git a/koffice-i18n-pt/docs/koffice/koffice/index.docbook b/koffice-i18n-pt/docs/koffice/koffice/index.docbook
index 2588ad14..a89f39bb 100644
--- a/koffice-i18n-pt/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-pt/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integração</title>
 <para
->O &koffice; oferece  uma plataforma onde todos os componentes assentam. Através desta plataforma, consegue-se uma alta integração. É possível desenvolver o seu próprio componente, para que se integre da mesma forma. Esta tecnologia está descrita em mais profundidade no <link linkend="kparts"
+>O &koffice; oferece  uma plataforma onde todos os componentes assentam. Através desta plataforma, consegue-se uma alta integração. É possível desenvolver o seu próprio componente, para que se integre da mesma forma. Esta tecnologia está descrita em mais profundidade no <link linkend="tdeparts"
 >capítulo das KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnologia do &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - os blocos de construção do &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Usar as KParts no seu documento</title>
 
diff --git a/koffice-i18n-pt/docs/koffice/kword/index.docbook b/koffice-i18n-pt/docs/koffice/kword/index.docbook
index 94a301cb..e9beec79 100644
--- a/koffice-i18n-pt/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-pt/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-pt/docs/koffice/kword/table.docbook b/koffice-i18n-pt/docs/koffice/kword/table.docbook
index 1b600ab7..e9a9d670 100644
--- a/koffice-i18n-pt/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-pt/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Lembre-se que, se precisar das funções de uma folha de cálculo, poderá <link linkend="kparts"
+>Lembre-se que, se precisar das funções de uma folha de cálculo, poderá <link linkend="tdeparts"
 >incorporar uma Tabela do &kspread;</link
 > no seu documento.</para
 ></tip>
diff --git a/koffice-i18n-pt/docs/koffice/kword/kparts.docbook b/koffice-i18n-pt/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-pt/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-pt/docs/koffice/kword/tdeparts.docbook
index 4cbbe218..1c6a6cd9 100644
--- a/koffice-i18n-pt/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-pt/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Veja os ficheiros de ajuda das outras aplicações para informações mais específicas.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Instruções gerais</title>
 <para
@@ -85,7 +85,7 @@
 >dentro do &kword;</emphasis
 >. Os detalhes de cada aplicação são diferentes. Por favor veja os manuais da aplicação do &koffice; específica para saber em detalhe como usar essa aplicação. (Por outras palavras, a partir daqui, se inserir uma folha de cálculo do &kspread;, então as janelas irão actuar da mesma forma que o &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Lidar com o componente inserido</title>
 <para
diff --git a/koffice-i18n-pt/messages/koffice/desktop_koffice.po b/koffice-i18n-pt/messages/koffice/desktop_koffice.po
index fdace9f8..9c888e7e 100644
--- a/koffice-i18n-pt/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pt/messages/koffice/desktop_koffice.po
@@ -1662,12 +1662,12 @@ msgstr "Name='Plugin' para Rodar a Imagem"
 msgid "Name=Screenshot"
 msgstr "Name=Captura"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name='Plugin' de programação"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permitir executar programas ou 'scripts'"
@@ -2208,11 +2208,11 @@ msgstr "GenericName=Palavras Relacionadas"
 msgid "Name=Print..."
 msgstr "Name=Imprimir..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Verificador Ortográfico"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Verificar a ortografia desta palavra"
 
diff --git a/koffice-i18n-pt/messages/koffice/kplato.po b/koffice-i18n-pt/messages/koffice/kplato.po
index 66b276a8..87d35ea2 100644
--- a/koffice-i18n-pt/messages/koffice/kplato.po
+++ b/koffice-i18n-pt/messages/koffice/kplato.po
@@ -853,31 +853,31 @@ msgstr "Fim:"
 msgid "Effort:"
 msgstr "Esforço:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupo"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Máx. de Unidades"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Atribuir recursos:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-pt_BR/acinclude.m4
+++ b/koffice-i18n-pt_BR/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook
index 5276d5f2..4e4e7e51 100644
--- a/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef FERRAMENTA_ESTRELA_H_
 #define FERRAMENTA_ESTRELA_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * Um módulo que oferece uma ferramenta de estrela.
diff --git a/koffice-i18n-pt_BR/docs/koffice/koffice/index.docbook b/koffice-i18n-pt_BR/docs/koffice/koffice/index.docbook
index 71a63464..b4b82638 100644
--- a/koffice-i18n-pt_BR/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-pt_BR/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integração</title>
 <para
->O &koffice; oferece uma plataforma onde todos os componentes são construídos. Através desta plataforma, consegue-se uma alta integração. É possível desenvolver o seu próprio componente, para que se integre da mesma forma. Esta tecnologia está descrita em mais profundidade no <link linkend="kparts"
+>O &koffice; oferece uma plataforma onde todos os componentes são construídos. Através desta plataforma, consegue-se uma alta integração. É possível desenvolver o seu próprio componente, para que se integre da mesma forma. Esta tecnologia está descrita em mais profundidade no <link linkend="tdeparts"
 >capítulo das KParts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Tecnologia do &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - o construtor de blocos do &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Usando KParts em seu documento</title>
 
diff --git a/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook b/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook
index 935bfc5f..54ccd094 100644
--- a/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-pt_BR/docs/koffice/kword/table.docbook b/koffice-i18n-pt_BR/docs/koffice/kword/table.docbook
index c4f3ce60..9d9eb828 100644
--- a/koffice-i18n-pt_BR/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-pt_BR/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Lembre-se, se você precisa das funções de uma planilha, você pode <link linkend="kparts"
+>Lembre-se, se você precisa das funções de uma planilha, você pode <link linkend="tdeparts"
 >embutir uma tabela do &kspread;</link
 > no seu documento.</para
 ></tip>
diff --git a/koffice-i18n-pt_BR/docs/koffice/kword/kparts.docbook b/koffice-i18n-pt_BR/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-pt_BR/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-pt_BR/docs/koffice/kword/tdeparts.docbook
index dc44da3d..4cb8b91d 100644
--- a/koffice-i18n-pt_BR/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-pt_BR/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Consulte os arquivos de ajuda das outras aplicações para informações mais específicas.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Instruções Gerais</title>
 <para
@@ -85,7 +85,7 @@
 >dentro do &kword;</emphasis
 >. Os detalhes de cada aplicação são diferentes. Por favor, veja os manuais da aplicação para detalhes de uso sobre uma aplicação específica (em outras palavras, a partir deste ponto, se você inserir uma planilha do &kspread;, então as janelas agirão do mesmo modo que no &kspread;).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Trabalhando com o componente inserido</title>
 <para
diff --git a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
index c6a1fc10..ac476097 100644
--- a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po
@@ -1652,12 +1652,12 @@ msgstr "Name=Plugin para Rodar a Imagem"
 msgid "Name=Screenshot"
 msgstr "Name=Captura de Tela"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Plugin de programação"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Permitir executar programas ou 'scripts'"
@@ -2197,11 +2197,11 @@ msgstr "GenericName=Palavras Relacionadas"
 msgid "Name=Print..."
 msgstr "Name=Imprimir..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Ferramenta de Verificação Ortográfica"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Verificar a Ortografia Desta Palavra"
 
diff --git a/koffice-i18n-pt_BR/messages/koffice/kplato.po b/koffice-i18n-pt_BR/messages/koffice/kplato.po
index 4739bcce..dffd9615 100644
--- a/koffice-i18n-pt_BR/messages/koffice/kplato.po
+++ b/koffice-i18n-pt_BR/messages/koffice/kplato.po
@@ -844,31 +844,31 @@ msgstr "Término:"
 msgid "Effort:"
 msgstr "Esforço:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupo"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Máx. de unidades"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Atribuir recursos:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-ru/acinclude.m4
+++ b/koffice-i18n-ru/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-ru/docs/koffice/koffice/index.docbook b/koffice-i18n-ru/docs/koffice/koffice/index.docbook
index 45203043..76f48523 100644
--- a/koffice-i18n-ru/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-ru/docs/koffice/koffice/index.docbook
@@ -108,7 +108,7 @@
 </chapter
 > 
 
-<chapter id="kparts">
+<chapter id="tdeparts">
 <title
 >Kparts - строительные блоки &koffice;</title>
 
@@ -150,7 +150,7 @@
 </sect1>
 
 
-<sect1 id="kparts-try-it">
+<sect1 id="tdeparts-try-it">
 <title
 >Использование KParts в документах</title>
 
diff --git a/koffice-i18n-ru/docs/koffice/kword/index.docbook b/koffice-i18n-ru/docs/koffice/kword/index.docbook
index 9ce3d4d8..85ccd536 100644
--- a/koffice-i18n-ru/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-ru/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-ru/docs/koffice/kword/table.docbook b/koffice-i18n-ru/docs/koffice/kword/table.docbook
index 4d1fadd5..c49c2b10 100644
--- a/koffice-i18n-ru/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-ru/docs/koffice/kword/table.docbook
@@ -13,7 +13,7 @@
 
 <tip
 ><para
->Заметьте, что если вам необходима функциональность электронных таблиц, вы можете <link linkend="kparts"
+>Заметьте, что если вам необходима функциональность электронных таблиц, вы можете <link linkend="tdeparts"
 >вставить в документ таблицу &kspread;</link
 >.</para
 ></tip>
diff --git a/koffice-i18n-ru/docs/koffice/kword/kparts.docbook b/koffice-i18n-ru/docs/koffice/kword/tdeparts.docbook
similarity index 98%
rename from koffice-i18n-ru/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-ru/docs/koffice/kword/tdeparts.docbook
index b74c8f91..63face94 100644
--- a/koffice-i18n-ru/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-ru/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -31,7 +31,7 @@
 <para
 >Обратитесь к справочному руководству других приложений для более подробных сведений.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Общие указания</title>
 <para
@@ -71,7 +71,7 @@
 >внутри себя</emphasis
 > выбранное вами приложение. Что именно произойдет, зависит от приложения. Обратитесь к справочному руководству других приложений &koffice; для более подробных сведений о работе с этими приложениями. (То есть, проще говоря, вставляя таблицу &kspread;, вы фактически начинаете работать в &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Работа со встроенными компонентами</title>
 <para
diff --git a/koffice-i18n-ru/messages/koffice/desktop_koffice.po b/koffice-i18n-ru/messages/koffice/desktop_koffice.po
index 8150dd2a..0c845395 100644
--- a/koffice-i18n-ru/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-ru/messages/koffice/desktop_koffice.po
@@ -1640,12 +1640,12 @@ msgstr "Name=Модуль вращения"
 msgid "Name=Screenshot"
 msgstr "Name=Снимок экрана"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Модуль поддержки сценариев"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Возможность выполнения сценариев"
@@ -2173,11 +2173,11 @@ msgstr "GenericName=Синонимы"
 msgid "Name=Print..."
 msgstr "Name=Печать..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Проверка правописания"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Проверка правописания этого слова"
 
diff --git a/koffice-i18n-ru/messages/koffice/kplato.po b/koffice-i18n-ru/messages/koffice/kplato.po
index 28624e90..1d64c5e5 100644
--- a/koffice-i18n-ru/messages/koffice/kplato.po
+++ b/koffice-i18n-ru/messages/koffice/kplato.po
@@ -833,31 +833,31 @@ msgstr "Окончание:"
 msgid "Effort:"
 msgstr "Загрузка:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Группа"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Единиц"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Назначенные ресурсы:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sk/acinclude.m4
+++ b/koffice-i18n-sk/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-sk/messages/koffice/desktop_koffice.po b/koffice-i18n-sk/messages/koffice/desktop_koffice.po
index c830ad2a..8359fd01 100644
--- a/koffice-i18n-sk/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sk/messages/koffice/desktop_koffice.po
@@ -1651,12 +1651,12 @@ msgstr "Name=Modul rotácia obrázkov"
 msgid "Name=Screenshot"
 msgstr "Name=Snímač obrazovky"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Modul pre skripty"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Povoliť vykonávanie skriptov"
@@ -2187,11 +2187,11 @@ msgstr "GenericName=Súvisiace slová"
 msgid "Name=Print..."
 msgstr "Name=Tlačiť..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Kontrola pravopisu"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Kontrola pravopisu tohto slova"
 
diff --git a/koffice-i18n-sk/messages/koffice/kplato.po b/koffice-i18n-sk/messages/koffice/kplato.po
index 1a0e3dc6..43fc73c5 100644
--- a/koffice-i18n-sk/messages/koffice/kplato.po
+++ b/koffice-i18n-sk/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Koniec:"
 msgid "Effort:"
 msgstr "Úsilie:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Skupina"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Max. jednotky"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Priradiť zdroje:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sl/acinclude.m4
+++ b/koffice-i18n-sl/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-sl/messages/koffice/desktop_koffice.po b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
index 1d051ad2..5007bff5 100644
--- a/koffice-i18n-sl/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sl/messages/koffice/desktop_koffice.po
@@ -1652,12 +1652,12 @@ msgstr "Name=Vstavek za vrtenje slike"
 msgid "Name=Screenshot"
 msgstr "Name=Posnetek zaslona"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Vstavek za skripte"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Dovoli izvedbo skriptov"
@@ -2193,11 +2193,11 @@ msgstr "GenericName=Povezane besede"
 msgid "Name=Print..."
 msgstr "Name=Natisni ..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Orodje za preverjanje črkovanja"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Preveri črkovanje te besede"
 
diff --git a/koffice-i18n-sl/messages/koffice/kplato.po b/koffice-i18n-sl/messages/koffice/kplato.po
index 8acc93dc..1221d809 100644
--- a/koffice-i18n-sl/messages/koffice/kplato.po
+++ b/koffice-i18n-sl/messages/koffice/kplato.po
@@ -816,31 +816,31 @@ msgstr "Konec:"
 msgid "Effort:"
 msgstr "Trud:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Skupina"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Največ enot"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Dodeli vire:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sr/acinclude.m4
+++ b/koffice-i18n-sr/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-sr/messages/koffice/desktop_koffice.po b/koffice-i18n-sr/messages/koffice/desktop_koffice.po
index 313a0f66..55aac6f4 100644
--- a/koffice-i18n-sr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sr/messages/koffice/desktop_koffice.po
@@ -1645,12 +1645,12 @@ msgstr "Name=Прикључак за ротирање слике"
 msgid "Name=Screenshot"
 msgstr "Name=Снимак екрана"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Прикључак за скриптовање"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Омогући извршавање скрипти"
@@ -2186,11 +2186,11 @@ msgstr "GenericName=Сличне речи"
 msgid "Name=Print..."
 msgstr "Name=Штампај..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Алат за проверу правописа"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Проверава се да ли је ова реч исправно написана"
 
diff --git a/koffice-i18n-sr/messages/koffice/kplato.po b/koffice-i18n-sr/messages/koffice/kplato.po
index dd9bba39..80566028 100644
--- a/koffice-i18n-sr/messages/koffice/kplato.po
+++ b/koffice-i18n-sr/messages/koffice/kplato.po
@@ -833,31 +833,31 @@ msgstr "Крај:"
 msgid "Effort:"
 msgstr "Напор:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Група"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Макс. јединица"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Доделите ресурсе:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sr@Latn/acinclude.m4
+++ b/koffice-i18n-sr@Latn/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
index b5df961e..3b2c82b5 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po
@@ -1646,12 +1646,12 @@ msgstr "Name=Priključak za rotiranje slike"
 msgid "Name=Screenshot"
 msgstr "Name=Snimak ekrana"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Priključak za skriptovanje"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Omogući izvršavanje skripti"
@@ -2187,11 +2187,11 @@ msgstr "GenericName=Slične reči"
 msgid "Name=Print..."
 msgstr "Name=Štampaj..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Alat za proveru pravopisa"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Proverava se da li je ova reč ispravno napisana"
 
diff --git a/koffice-i18n-sr@Latn/messages/koffice/kplato.po b/koffice-i18n-sr@Latn/messages/koffice/kplato.po
index 03caf3cd..6911e555 100644
--- a/koffice-i18n-sr@Latn/messages/koffice/kplato.po
+++ b/koffice-i18n-sr@Latn/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Kraj:"
 msgid "Effort:"
 msgstr "Napor:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupa"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. jedinica"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Dodelite resurse:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook
index 2c3c039b..7d7acde7 100644
--- a/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include &lt;kparts/plugin.h&gt;
+#include &lt;tdeparts/plugin.h&gt;
 
 /**
 * En modul som tillhandahåller ett stjärnverktyg.
diff --git a/koffice-i18n-sv/docs/koffice/koffice/index.docbook b/koffice-i18n-sv/docs/koffice/koffice/index.docbook
index a6fe9e19..3d006f9f 100644
--- a/koffice-i18n-sv/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-sv/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integrerat</title>
 <para
->&koffice; tillhandahåller en stomme som alla komponenter bygger på. Via denna stomme uppnås hög integration. Det är möjligt att utveckla egna komponenter som också kan integreras. Denna teknologi beskrivs djupare i <link linkend="kparts"
+>&koffice; tillhandahåller en stomme som alla komponenter bygger på. Via denna stomme uppnås hög integration. Det är möjligt att utveckla egna komponenter som också kan integreras. Denna teknologi beskrivs djupare i <link linkend="tdeparts"
 >kapitlet om Kparts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Teknologi i &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >Kparts - byggblocken i &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Att använda Kparts i dina dokument</title>
 
diff --git a/koffice-i18n-sv/docs/koffice/kword/index.docbook b/koffice-i18n-sv/docs/koffice/kword/index.docbook
index 73c3890d..8adb34d5 100644
--- a/koffice-i18n-sv/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-sv/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-sv/docs/koffice/kword/table.docbook b/koffice-i18n-sv/docs/koffice/kword/table.docbook
index 04a4e44b..a7777918 100644
--- a/koffice-i18n-sv/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-sv/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Kom ihåg, om du behöver funktionen i ett kalkylprogram, kan du <link linkend="kparts"
+>Kom ihåg, om du behöver funktionen i ett kalkylprogram, kan du <link linkend="tdeparts"
 >infoga en &kspread;-tabell</link
 > i dokumentet.</para
 ></tip>
diff --git a/koffice-i18n-sv/docs/koffice/kword/kparts.docbook b/koffice-i18n-sv/docs/koffice/kword/tdeparts.docbook
similarity index 97%
rename from koffice-i18n-sv/docs/koffice/kword/kparts.docbook
rename to koffice-i18n-sv/docs/koffice/kword/tdeparts.docbook
index ab578689..41054180 100644
--- a/koffice-i18n-sv/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-sv/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Titta i hjälpfilerna för övriga program för mer specifik information.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Allmänna instruktioner</title>
 <para
@@ -85,7 +85,7 @@
 >inne i &kword;</emphasis
 >. Detaljerna skiljer sig åt för varje program. Se handboken för det specifika &koffice;-programmet för information om hur det programmet används. (Med andra ord, hädanefter, om du infogat ett kalkylblad från &kspread;, så fungerar fönstren på samma sätt som i &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Arbeta med den infogade komponenten</title>
 <para
diff --git a/koffice-i18n-sv/messages/koffice/desktop_koffice.po b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
index f08cf901..d02a071f 100644
--- a/koffice-i18n-sv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
@@ -1639,12 +1639,12 @@ msgstr "Name=Insticksprogram för rotera bild"
 msgid "Name=Screenshot"
 msgstr "Name=Skärmdump"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Skriptinsticksprogram"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Tillåt körning av skript"
@@ -2176,11 +2176,11 @@ msgstr "GenericName=Relaterade ord"
 msgid "Name=Print..."
 msgstr "Name=Skriv ut..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Rättstavningsverktyg"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Kontrollera det här ordets stavning"
 
diff --git a/koffice-i18n-sv/messages/koffice/kplato.po b/koffice-i18n-sv/messages/koffice/kplato.po
index bc5914f7..72ae92b4 100644
--- a/koffice-i18n-sv/messages/koffice/kplato.po
+++ b/koffice-i18n-sv/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Avslutning:"
 msgid "Effort:"
 msgstr "Insats:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupp"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maximalt antal enheter"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Tilldela resurser:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-tr/acinclude.m4
+++ b/koffice-i18n-tr/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-tr/messages/koffice/desktop_koffice.po b/koffice-i18n-tr/messages/koffice/desktop_koffice.po
index 46e038e8..3ea3ca69 100644
--- a/koffice-i18n-tr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-tr/messages/koffice/desktop_koffice.po
@@ -1689,13 +1689,13 @@ msgstr "Name=Suluboya Boyama Eklentisi"
 msgid "Name=Screenshot"
 msgstr "Name=Betikler"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 #, fuzzy
 msgid "Name=Scripting plugin"
 msgstr "Name=Aktarım Eklentisi"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:31
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:31
 #: kspread/plugins/scripting/kspreadscripting.desktop:31
 #, fuzzy
 msgid "Comment=Allow execution of scripts"
@@ -2243,11 +2243,11 @@ msgstr "GenericName=İlişkili Kelimeler"
 msgid "Name=Print..."
 msgstr "Name=Yazdır..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=İmla Denetim Aracı"
 
-#: tools/spell/kspelltool.desktop:68
+#: tools/spell/tdespelltool.desktop:68
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Bu Kelimenin İmla Denetimini Yap"
 
diff --git a/koffice-i18n-tr/messages/koffice/kplato.po b/koffice-i18n-tr/messages/koffice/kplato.po
index 3557eaf9..0869d11b 100644
--- a/koffice-i18n-tr/messages/koffice/kplato.po
+++ b/koffice-i18n-tr/messages/koffice/kplato.po
@@ -796,31 +796,31 @@ msgstr "Bitişi daha geç değil"
 msgid "Effort:"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, fuzzy, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "ResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, fuzzy, no-c-format
 msgid "Group"
 msgstr "Gruplar"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, fuzzy, no-c-format
 msgid "Assign resources:"
 msgstr "Kaynak"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-uk/acinclude.m4
+++ b/koffice-i18n-uk/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-uk/messages/koffice/desktop_koffice.po b/koffice-i18n-uk/messages/koffice/desktop_koffice.po
index 6a521469..ea603e16 100644
--- a/koffice-i18n-uk/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-uk/messages/koffice/desktop_koffice.po
@@ -1649,12 +1649,12 @@ msgstr "Name=Втулок обертання зображень"
 msgid "Name=Screenshot"
 msgstr "Name=Знімок екрана"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Втулок для скриптів"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Дає змогу виконувати скрипти"
@@ -2187,11 +2187,11 @@ msgstr "GenericName=Пов'язані слова"
 msgid "Name=Print..."
 msgstr "Name=Друк..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Утиліта перевірки правопису"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Перевірити правопис цього слова"
 
diff --git a/koffice-i18n-uk/messages/koffice/kplato.po b/koffice-i18n-uk/messages/koffice/kplato.po
index a6a24517..4313802e 100644
--- a/koffice-i18n-uk/messages/koffice/kplato.po
+++ b/koffice-i18n-uk/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Закінчення:"
 msgid "Effort:"
 msgstr "Досягнення:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Група"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Макс. одиниць"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Призначити ресурси:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
index 2e431b23..a84ee475 100644
--- a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
@@ -1694,12 +1694,12 @@ msgstr "Name=水彩绘画插件"
 msgid "Name=Screenshot"
 msgstr "Name=抓图"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=脚本插件"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=允许执行脚本"
@@ -2227,11 +2227,11 @@ msgstr "GenericName=相关单词"
 msgid "Name=Print..."
 msgstr "Name=打印..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=拼写检查工具"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=检查该词拼写"
 
diff --git a/koffice-i18n-zh_CN/messages/koffice/kplato.po b/koffice-i18n-zh_CN/messages/koffice/kplato.po
index 4eed54eb..df77c6e2 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kplato.po
+++ b/koffice-i18n-zh_CN/messages/koffice/kplato.po
@@ -796,31 +796,31 @@ msgstr "完成："
 msgid "Effort:"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "分组"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr ""
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "指派资源："
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"
diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-zh_TW/acinclude.m4
+++ b/koffice-i18n-zh_TW/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
index 577d8ed4..6169729b 100644
--- a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po
@@ -1643,12 +1643,12 @@ msgstr "Name=旋轉圖片外掛程式"
 msgid "Name=Screenshot"
 msgstr "Name=螢幕快照"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=命令稿外掛程式"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=允許執行命令稿"
@@ -2174,11 +2174,11 @@ msgstr "GenericName=相關單字"
 msgid "Name=Print..."
 msgstr "Name=列印..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=拼字檢查工具"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=拼字檢查"
 
diff --git a/koffice-i18n-zh_TW/messages/koffice/kplato.po b/koffice-i18n-zh_TW/messages/koffice/kplato.po
index fc21fe53..be4e1994 100644
--- a/koffice-i18n-zh_TW/messages/koffice/kplato.po
+++ b/koffice-i18n-zh_TW/messages/koffice/kplato.po
@@ -818,31 +818,31 @@ msgstr "完成："
 msgid "Effort:"
 msgstr "花費時間："
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "群組"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "最大單位"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "指定資源："
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"