diff --git a/Makefile.am b/Makefile.am
index 976d79c..3daa340 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 SUBDIRS = src po doc icons xslt
 
@@ -17,7 +17,7 @@ tellico.lsm tellico.dtd x-tellico.desktop \
 configure.in.in AUTHORS NEWS tellico.tips \
 tellico.desktop tellico.xml $(ADMIN_DIST)
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 # not a GNU package. You can remove this line, if 
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign
diff --git a/acinclude.m4 b/acinclude.m4
index 9b056cf..1e1fa29 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
 dnl Please do not modify this file unless you expect your modifications to be
 dnl carried into every other module in the repository. 
 dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
+dnl Single-module modifications are best placed in configure.in for tdelibs
+dnl and tdebase or configure.in.in if present.
 
 dnl ------------------------------------------------------------------------
 dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
@@ -113,41 +113,41 @@ ac_x_libraries=],
 [LIBS="$ac_save_LIBS"
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+    /usr/X11/lib${tdelibsuff}           \
+    /usr/X11R6/lib${tdelibsuff}         \
+    /usr/X11R5/lib${tdelibsuff}         \
+    /usr/X11R4/lib${tdelibsuff}         \
                                         \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
+    /usr/lib${tdelibsuff}/X11           \
+    /usr/lib${tdelibsuff}/X11R6         \
+    /usr/lib${tdelibsuff}/X11R5         \
+    /usr/lib${tdelibsuff}/X11R4         \
                                         \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
+    /usr/local/X11/lib${tdelibsuff}     \
+    /usr/local/X11R6/lib${tdelibsuff}   \
+    /usr/local/X11R5/lib${tdelibsuff}   \
+    /usr/local/X11R4/lib${tdelibsuff}   \
                                         \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
+    /usr/local/lib${tdelibsuff}/X11     \
+    /usr/local/lib${tdelibsuff}/X11R6   \
+    /usr/local/lib${tdelibsuff}/X11R5   \
+    /usr/local/lib${tdelibsuff}/X11R4   \
                                         \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
+    /usr/X386/lib${tdelibsuff}          \
+    /usr/x386/lib${tdelibsuff}          \
+    /usr/XFree86/lib${tdelibsuff}/X11   \
                                         \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
+    /usr/lib${tdelibsuff}               \
+    /usr/local/lib${tdelibsuff}         \
+    /usr/unsupported/lib${tdelibsuff}   \
+    /usr/athena/lib${tdelibsuff}        \
+    /usr/local/x11r5/lib${tdelibsuff}   \
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
+    /lib/usr/lib${tdelibsuff}/X11       \
                                         \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
+    /usr/openwin/lib${tdelibsuff}       \
+    /usr/openwin/share/lib${tdelibsuff} \
     ; \
 do
 dnl Don't even attempt the hair of trying to link an X program!
@@ -384,7 +384,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
 else
   AC_MSG_ERROR([your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
@@ -941,7 +941,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
+    ac_x_libraries="/usr/lib${tdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -1422,7 +1422,7 @@ qt_includes=""
 AC_ARG_WITH(qt-dir,
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
@@ -1463,7 +1463,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1648,11 +1648,11 @@ rm -f actest.ui actest.cpp
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
 	AC_MSG_ERROR([
-you need to install kdelibs first.
+you need to install tdelibs first.
 
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs. 
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs. 
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 ])
@@ -1809,8 +1809,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -1828,7 +1828,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -1843,7 +1843,7 @@ else
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
 fi
 
-else dnl test -z $1, e.g. from kdelibs
+else dnl test -z $1, e.g. from tdelibs
 
   ac_cv_have_kde="have_kde=no"
 
@@ -3504,16 +3504,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
 
 AC_DEFUN([KDE_CHECK_LIB64],
 [
-    kdelibsuff="$kde_libs_suffix"
-    if test -z "$kdelibsuff"; then
-       kdelibsuff="auto"
+    tdelibsuff="$kde_libs_suffix"
+    if test -z "$tdelibsuff"; then
+       tdelibsuff="auto"
     fi
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none,auto[=default])]),
-            kdelibsuff=$enableval)
+            tdelibsuff=$enableval)
     
-    if test "$kdelibsuff" = "auto"; then
+    if test "$tdelibsuff" = "auto"; then
     
 cat > conftest.c << EOF
 #include <stdio.h>
@@ -3521,23 +3521,23 @@ int main() {
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"`
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no"; then
+       tdelibsuff=
     fi    
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
     fi
 ])
 
@@ -4562,7 +4562,7 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
 if test ! -r $python_libdir/libpython$version.so; then
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4950,7 +4950,7 @@ AC_DEFUN([KDE_CONF_FILES],
   AC_SUBST(CONF_FILES)
 ])dnl
 
-dnl This sets the prefix, for arts and kdelibs
+dnl This sets the prefix, for arts and tdelibs
 dnl Do NOT use in any other module.
 dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
@@ -4997,9 +4997,9 @@ AC_DEFUN([KDE_SET_PREFIX],
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                     This means it has been moved since you installed it.
-                    This won't work. Please recompile kdelibs for the new prefix.
+                    This won't work. Please recompile tdelibs for the new prefix.
                     ])
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5269,9 +5269,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
 dnl also defines KSTUFF_PKG_ERRORS on error
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
 
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    if test "$prefix" != "$kde_libs_prefix"; then
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    fi
    export PKG_CONFIG_PATH
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
diff --git a/configure.in b/configure.in
index 80c34ee..80c5188 100644
--- a/configure.in
+++ b/configure.in
@@ -78,7 +78,7 @@ AC_DEFUN([AM_KDE_MIN_VERSION],
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -I$srcdir $all_includes"
     AC_TRY_COMPILE([
-        #include "kdeversion.h"
+        #include "tdeversion.h"
         #if !( KDE_IS_VERSION( $1, $2, $3 ) )
         #error KDE version does not meet minimum requirement
         #endif
@@ -88,12 +88,12 @@ AC_DEFUN([AM_KDE_MIN_VERSION],
 ])
 AM_KDE_MIN_VERSION(3,3,1)
 
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DQT_NO_ASCII_CAST -DQT_NO_TRANSLATION" dnl __kdevelop[exc]__
+dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
+dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
+dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DQT_NO_ASCII_CAST -DQT_NO_TRANSLATION" dnl __tdevelop[exc]__
 
-dnl KDE_NEED_FLEX dnl __kdevelop__
-dnl AC_PROG_YACC dnl __kdevelop__
+dnl KDE_NEED_FLEX dnl __tdevelop__
+dnl AC_PROG_YACC dnl __tdevelop__
 
 AC_MSG_CHECKING(for ushort in <sys/types.h>)
 AC_CACHE_VAL(bt_cv_type_ushort, [
diff --git a/configure.in.in b/configure.in.in
index 7b0479c..d05766e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,7 +13,7 @@ AC_DEFUN([AM_KDE_MIN_VERSION],
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -I$srcdir $all_includes"
     AC_TRY_COMPILE([
-        #include "kdeversion.h"
+        #include "tdeversion.h"
         #if !( KDE_IS_VERSION( $1, $2, $3 ) )
         #error KDE version does not meet minimum requirement
         #endif
@@ -23,12 +23,12 @@ AC_DEFUN([AM_KDE_MIN_VERSION],
 ])
 AM_KDE_MIN_VERSION(3,3,1)
 
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DQT_NO_ASCII_CAST -DQT_NO_TRANSLATION" dnl __kdevelop[exc]__
+dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
+dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
+dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS -DQT_NO_ASCII_CAST -DQT_NO_TRANSLATION" dnl __tdevelop[exc]__
 
-dnl KDE_NEED_FLEX dnl __kdevelop__
-dnl AC_PROG_YACC dnl __kdevelop__
+dnl KDE_NEED_FLEX dnl __tdevelop__
+dnl AC_PROG_YACC dnl __tdevelop__
 
 AC_MSG_CHECKING(for ushort in <sys/types.h>)
 AC_CACHE_VAL(bt_cv_type_ushort, [
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 88b7aa7..93202ac 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 SUBDIRS = en fr
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index 5cfedb9..f8bb76a 100644
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -10,7 +10,7 @@ KDE_CREATE_HANDBOOK( index.docbook Xi
 
 #original Makefile.am contents follow:
 
-######## kdevelop will overwrite this part!!! (begin)##########
+######## tdevelop will overwrite this part!!! (begin)##########
 #
 #
 #EXTRA_DIST = \
@@ -54,7 +54,7 @@ KDE_CREATE_HANDBOOK( index.docbook Xi
 #imdb-options.png
 #
 #
-######## kdevelop will overwrite this part!!! (end)############
+######## tdevelop will overwrite this part!!! (end)############
 #
 #KDE_LANG = en
 #KDE_DOCS = tellico
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index adc1d6f..3229824 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = \
@@ -42,7 +42,7 @@ sru-options.png \
 imdb-options.png
 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_LANG = en
 KDE_DOCS = tellico
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 8cbae31..53047a1 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -336,7 +336,7 @@ Updates and news can be found there.</para>
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
index 8e5d934..99346d1 100644
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${K
 
 #original Makefile.am contents follow:
 
-######## kdevelop will overwrite this part!!! (begin)##########
+######## tdevelop will overwrite this part!!! (begin)##########
 #
 #
 #EXTRA_DIST = \
@@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${K
 #imdb-options.png
 #
 #
-######## kdevelop will overwrite this part!!! (end)############
+######## tdevelop will overwrite this part!!! (end)############
 #
 #KDE_LANG = fr
 #KDE_DOCS = tellico
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 0d55385..1005b68 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = \
@@ -42,7 +42,7 @@ sru-options.png \
 imdb-options.png
 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_LANG = fr
 KDE_DOCS = tellico
diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook
index 1de7d0d..68d241e 100644
--- a/doc/fr/index.docbook
+++ b/doc/fr/index.docbook
@@ -358,7 +358,7 @@ Les mises à jour et les nouvelles informations s'y trouvent.</para>
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/icons/Makefile.am b/icons/Makefile.am
index a8a770b..b36f841 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = \
@@ -25,7 +25,7 @@ nocover_album.png         nocover_game.png        nocover_bibtex.png \
 nocover_comic.png         script.svg              script.png \
 boardgame.png             nocover_boardgame.png
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_OPTIONS = noautodist
 
diff --git a/po/Makefile.am b/po/Makefile.am
index bf7803b..567fe46 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -1,9 +1,9 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = tellico.pot README
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 POFILES = AUTO
 
 CLEANFILES = *~
diff --git a/po/it.po b/po/it.po
index 98d695d..a035ff6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2008-01-26 10:52-0800\n"
 "PO-Revision-Date: 2005-10-12 18:20+0200\n"
 "Last-Translator: Lorenzo Novaro <novalore@inwind.it>\n"
-"Language-Team: Italiano <kde-i18n-it@kde.org>\n"
+"Language-Team: Italiano <tde-i18n-it@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nl.po b/po/nl.po
index e628ac3..a291f29 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2008-01-26 10:52-0800\n"
 "PO-Revision-Date: 2005-08-11 11:02+0200\n"
 "Last-Translator: Fred Marchee <fredmarchee@gmail.com>\n"
-"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
+"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2007406..e44d49f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = tellico
 
 tellico_SOURCES = borrower.cpp borrowerdialog.cpp \
@@ -87,7 +87,7 @@ entrymerger.h entrymerger.cpp \
 xmphandler.h xmphandler.cpp \
 lccnvalidator.h lccnvalidator.cpp
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
 # kde_icondir         Where your icon should go to - better use KDE_ICON.
diff --git a/src/calendarhandler.h b/src/calendarhandler.h
index d2962d1..9729af3 100644
--- a/src/calendarhandler.h
+++ b/src/calendarhandler.h
@@ -17,7 +17,7 @@
 #include <config.h>
 #include "borrower.h"
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 // libkcal is not binary compatible between versions
 // for now, just support KDE 3.4 and higher
diff --git a/src/collections/Makefile.am b/src/collections/Makefile.am
index 21543d0..477f826 100644
--- a/src/collections/Makefile.am
+++ b/src/collections/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = libcollections.a
 
 AM_CPPFLAGS = $(all_includes)
@@ -11,7 +11,7 @@ libcollections_a_SOURCES = winecollection.cpp stampcollection.cpp \
 	bookcollection.cpp gamecollection.cpp filecatalog.cpp \
 	boardgamecollection.cpp
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_OPTIONS = noautodist
 
diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp
index ea644ba..b9d2799 100644
--- a/src/core/netaccess.cpp
+++ b/src/core/netaccess.cpp
@@ -15,7 +15,7 @@
 #include "../tellico_kernel.h"
 #include "../tellico_debug.h"
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kio/job.h>
 #include <kio/netaccess.h>
 #include <kio/scheduler.h>
diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp
index e185b24..70b2288 100644
--- a/src/entryeditdialog.cpp
+++ b/src/entryeditdialog.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kaccelmanager.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kpushbutton.h>
 #include <kaccel.h>
 
diff --git a/src/fetch/Makefile.am b/src/fetch/Makefile.am
index fbf2ea1..017ef60 100644
--- a/src/fetch/Makefile.am
+++ b/src/fetch/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = libfetch.a
 
 AM_CPPFLAGS = $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(YAZ_CFLAGS)
@@ -12,7 +12,7 @@ libfetch_a_SOURCES = amazonfetcher.cpp animenfofetcher.cpp arxivfetcher.cpp \
 	isbndbfetcher.cpp messagehandler.cpp srufetcher.cpp yahoofetcher.cpp z3950connection.cpp \
 	z3950fetcher.cpp
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 SUBDIRS = scripts
 
diff --git a/src/fetch/scripts/Makefile.am b/src/fetch/scripts/Makefile.am
index 050c460..a767d24 100644
--- a/src/fetch/scripts/Makefile.am
+++ b/src/fetch/scripts/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 EXTRA_DIST = \
 fr.allocine.py fr.allocine.py.spec \
@@ -6,7 +6,7 @@ ministerio_de_cultura.py ministerio_de_cultura.py.spec \
 dark_horse_comics.py dark_horse_comics.py.spec \
 boardgamegeek.rb boardgamegeek.rb.spec
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 scriptdir = $(kde_datadir)/tellico/data-sources
 script_SCRIPTS = \
diff --git a/src/filterdialog.h b/src/filterdialog.h
index d12b5f0..a9e6b54 100644
--- a/src/filterdialog.h
+++ b/src/filterdialog.h
@@ -14,7 +14,7 @@
 #ifndef FILTERDIALOG_H
 #define FILTERDIALOG_H
 
-// kwidgetlister is copied from tdepim/libkdenetwork cvs
+// kwidgetlister is copied from tdepim/libtdenetwork cvs
 #include "gui/kwidgetlister.h"
 #include "filter.h"
 #include "datavectors.h"
diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp
index ae0e711..8574d28 100644
--- a/src/gui/kwidgetlister.cpp
+++ b/src/gui/kwidgetlister.cpp
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     kwidgetlister.cpp
 
-    This file is part of libkdenetwork.
+    This file is part of libtdenetwork.
     Copyright (c) 2001 Marc Mutz <mutz@kde.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/src/gui/kwidgetlister.h b/src/gui/kwidgetlister.h
index 3e98fd3..0124b65 100644
--- a/src/gui/kwidgetlister.h
+++ b/src/gui/kwidgetlister.h
@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     kwidgetlister.h
 
-    This file is part of libkdenetwork.
+    This file is part of libtdenetwork.
     Copyright (c) 2001 Marc Mutz <mutz@kde.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/src/gui/listview.h b/src/gui/listview.h
index 6f2ec8b..3f1c485 100644
--- a/src/gui/listview.h
+++ b/src/gui/listview.h
@@ -18,7 +18,7 @@
 #include "../listviewcomparison.h"
 
 #include <klistview.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 
 #include <tqdict.h>
 
diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp
index 90bd50f..3847df6 100644
--- a/src/newstuff/manager.cpp
+++ b/src/newstuff/manager.cpp
@@ -27,7 +27,7 @@
 #include <ktempfile.h>
 #include <kio/job.h>
 #include <kfileitem.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <knewstuff/entry.h>
 #include <kstandarddirs.h>
 
diff --git a/src/newstuff/newscript.h b/src/newstuff/newscript.h
index d8b7a43..f59646a 100644
--- a/src/newstuff/newscript.h
+++ b/src/newstuff/newscript.h
@@ -14,7 +14,7 @@
 #ifndef TELLICO_NEWSTUFF_NEWSCRIPT_H
 #define TELLICO_NEWSTUFF_NEWSCRIPT_H
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kurl.h>
 
 #if KDE_IS_VERSION(3,3,90)
diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp
index 4288cdd..20eda49 100644
--- a/src/newstuff/providerloader.cpp
+++ b/src/newstuff/providerloader.cpp
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// this class is largely copied from kdelibs/knewstuff/provider.cpp
+// this class is largely copied from tdelibs/knewstuff/provider.cpp
 // which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 // and licensed under GPL v2, just like Tellico
 
diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h
index 5dd8c17..56b688e 100644
--- a/src/newstuff/providerloader.h
+++ b/src/newstuff/providerloader.h
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// this class is largely copied from kdelibs/knewstuff/provider.h
+// this class is largely copied from tdelibs/knewstuff/provider.h
 // which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 // and licensed under GPL v2, just like Tellico
 //
diff --git a/src/translators/Makefile.am b/src/translators/Makefile.am
index 68ee4cc..fbbb11b 100644
--- a/src/translators/Makefile.am
+++ b/src/translators/Makefile.am
@@ -1,7 +1,7 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = libtranslators.a
 
-## AM_CPPFLAGS were found outside kdevelop specific part
+## AM_CPPFLAGS were found outside tdevelop specific part
 
 libtranslators_a_METASOURCES = AUTO
 
@@ -53,7 +53,7 @@ pdfimporter.cpp          referencerimporter.h     referencerimporter.cpp \
 libcsv.h                 libcsv.c \
 deliciousimporter.h      deliciousimporter.cpp
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 AM_CPPFLAGS = \
  $(LIBXML_CFLAGS) \
diff --git a/src/translators/btparse/Makefile.am b/src/translators/btparse/Makefile.am
index 84af63b..4a16ad3 100644
--- a/src/translators/btparse/Makefile.am
+++ b/src/translators/btparse/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 if !USE_LIBBTPARSE
 
 noinst_LIBRARIES = libbtparse.a
@@ -13,6 +13,6 @@ endif
 
 EXTRA_DIST = btparse.h init.c stdpccts.h attrib.h lex_auxiliary.h error.h parse_auxiliary.h prototypes.h tokens.h mode.h input.c postprocess.c error.c macros.c sym.h sym.c bt_debug.h traversal.c modify.c names.c my_alloca.h tex_tree.c string_util.c format_name.c antlr.h ast.h btconfig.h dlgdef.h parse_auxiliary.c lex_auxiliary.c util.c scan.c dlgauto.h ast.c err.h err.c bibtex.c bibtex_ast.c 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_OPTIONS = noautodist
diff --git a/src/translators/pilotdb/Makefile.am b/src/translators/pilotdb/Makefile.am
index cf21d12..dba2dbb 100644
--- a/src/translators/pilotdb/Makefile.am
+++ b/src/translators/pilotdb/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = libpilotdb.a
 
 AM_CPPFLAGS = $(all_includes)
@@ -11,6 +11,6 @@ SUBDIRS = libflatfile libpalm
 
 EXTRA_DIST = strop.cpp strop.h portability.h pilotdb.h pilotdb.cpp 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_OPTIONS = noautodist
diff --git a/src/translators/pilotdb/libflatfile/Makefile.am b/src/translators/pilotdb/libflatfile/Makefile.am
index d3ab012..b97ec32 100644
--- a/src/translators/pilotdb/libflatfile/Makefile.am
+++ b/src/translators/pilotdb/libflatfile/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = liblibflatfile.a
 
 AM_CPPFLAGS = $(all_includes)
@@ -10,7 +10,7 @@ liblibflatfile_a_SOURCES = DB.cpp Database.cpp
 
 EXTRA_DIST = Database.cpp Database.h DB.cpp DB.h Field.h FType.h ListView.h ListViewColumn.h Record.h
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 # is this the right way to do this? I need to include the strop.o object file since its
 # in the parent directory
diff --git a/src/translators/pilotdb/libpalm/Makefile.am b/src/translators/pilotdb/libpalm/Makefile.am
index ea92331..709a406 100644
--- a/src/translators/pilotdb/libpalm/Makefile.am
+++ b/src/translators/pilotdb/libpalm/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 noinst_LIBRARIES = liblibpalm.a
 
 AM_CPPFLAGS = $(all_includes)
@@ -10,6 +10,6 @@ liblibpalm_a_SOURCES = Database.cpp Block.cpp
 
 EXTRA_DIST = Block.cpp Block.h palmtypes.h Record.h Resource.h Database.h Database.cpp 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_OPTIONS = noautodist
diff --git a/xslt/entry-templates/Makefile.am b/xslt/entry-templates/Makefile.am
index 5b1b875..897fadb 100644
--- a/xslt/entry-templates/Makefile.am
+++ b/xslt/entry-templates/Makefile.am
@@ -1,9 +1,9 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = Default.xsl Video.xsl Album.xsl Fancy.xsl Compact.xsl
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 xsldir = $(kde_datadir)/tellico/entry-templates
 xsl_DATA = Default.xsl Video.xsl Album.xsl Fancy.xsl Compact.xsl
diff --git a/xslt/report-templates/Makefile.am b/xslt/report-templates/Makefile.am
index 36c6dca..e40f424 100644
--- a/xslt/report-templates/Makefile.am
+++ b/xslt/report-templates/Makefile.am
@@ -1,11 +1,11 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
 EXTRA_DIST = Column_View.xsl Title_Listing_(Horizontal).xsl\
 	Title_Listing_(Vertical).xsl Group_View.xsl Image_List.xsl \
 	Loan_View.xsl Group_Summary.xsl Tri-Column.xsl
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 xsldir = $(kde_datadir)/tellico/report-templates
 xsl_DATA = Column_View.xsl Title_Listing_(Horizontal).xsl \