Additional k => tde renaming and fixes

13 files changed, 184 insertions, 184 deletions

diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index 14866eb3..547b39f6 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/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.
 
 # KDE_PATH_X_DIRECT
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,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!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
 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
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,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
@@ -1418,7 +1418,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
     ])
 
@@ -1459,7 +1459,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
@@ -1644,11 +1644,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.
 ])
@@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
   kde_check_lib="libtdeio.la"
@@ -1793,8 +1793,8 @@ fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $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"
@@ -1824,7 +1824,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/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
@@ -1839,7 +1839,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"
 
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 
 if test $kde_qtver = 3; then
    case $host in 
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
 else
   case "$1" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
+		kde_cv_proto_$1="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none,auto[=default])]),
-            kdelibsuff=$enableval, kdelibsuff="auto")
+            tdelibsuff=$enableval, tdelibsuff="auto")
     
-    if test "$kdelibsuff" = "auto"; then
+    if test "$tdelibsuff" = "auto"; then
     
 cat > conftest.c << EOF
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
     s,.*/lib\([[^\/]]*\)/.*,\1, 
     p 
 }'`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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
 ])
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,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)
@@ -4946,14 +4946,14 @@ 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
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
   else
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
     kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
     PATH="$kde_save_PATH"
   fi
 
   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`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
   else
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
     given_prefix=$prefix
@@ -5661,7 +5661,7 @@ ssl_includes=""
 AC_ARG_WITH(ssl-dir,
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
     [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
     ])
 
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
   ac_ssl_includes="$ssl_incdir"
 
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
   if test ! "$ac_ssl_libraries" = "NO"; then
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
   fi
@@ -5918,9 +5918,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/koffice-i18n-et/configure.in b/koffice-i18n-et/configure.in
index 764f0b2b..de1d9279 100644
--- a/koffice-i18n-et/configure.in
+++ b/koffice-i18n-et/configure.in
@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
 dnl =======================================================
 
 AC_INIT(messages/Makefile.am)
-AM_INIT_AUTOMAKE(kde-i18n-et, "3.5.7")
+AM_INIT_AUTOMAKE(koffice-i18n-et, "3.5.7")
 AM_CONFIG_HEADER(config.h)
 AC_SUBST(AUTODIRS)
 AM_KDE_WITH_NLS
@@ -39,13 +39,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
index c2cd346c..406642dd 100644
--- a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
@@ -246,8 +246,8 @@ Icon=
 Name=Kasutajale nähtav nimi
 ServiceTypes=Chalk/Filter
 Type=Service
-X-KDE-Library=chalkLIBRARYNAME
-X-KDE-Version=2
+X-TDE-Library=chalkLIBRARYNAME
+X-TDE-Version=2
 </programlisting>
 </para
 ><para
@@ -412,7 +412,7 @@ ToolStar::~ToolStar()
 
 <para
 >&chalk; laadib pluginad versiooniga <literal
->X-KDE-Version=2</literal
+>X-TDE-Version=2</literal
 >, mille määrab <literal role="extension"
 >.desktop</literal
 >-fail. &chalk; 1.6 pluginad on arvatavasti binaarselt ühildumatud 1.5 pluginatega ja vajavad versiooni 3. &chalk; 2.0 pluginad vajavad versiooni 3. Jah, see pole just täiesti loogiline. </para>
@@ -1407,10 +1407,10 @@ METASOURCES = AUTO
 >Import: </para>
 
 <programlisting
->X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-xcf-gimp
-X-KDE-Weight=1
-X-KDE-Library=libchalkXXXimport
+>X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-xcf-gimp
+X-TDE-Weight=1
+X-TDE-Library=libchalkXXXimport
 ServiceTypes=KOfficeFilter
 </programlisting>
 
@@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter
 >Eksport: </para>
 
 <programlisting
->X-KDE-Export=image/x-xcf-gimp
-X-KDE-Import=application/x-chalk
+>X-TDE-Export=image/x-xcf-gimp
+X-TDE-Import=application/x-chalk
 ServiceTypes=KOfficeFilter
 Type=Service
-X-KDE-Weight=1
-X-KDE-Library=libchalkXXXexport
+X-TDE-Weight=1
+X-TDE-Library=libchalkXXXexport
 </programlisting>
 
 <para
diff --git a/koffice-i18n-et/docs/koffice/chalk/installation.docbook b/koffice-i18n-et/docs/koffice/chalk/installation.docbook
index fb135f57..bd3bd33d 100644
--- a/koffice-i18n-et/docs/koffice/chalk/installation.docbook
+++ b/koffice-i18n-et/docs/koffice/chalk/installation.docbook
@@ -13,8 +13,8 @@
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
-kdelibs, or kdebase.
+.Libraries or other software that is not included in tdesupport,
+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/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook
index 9af48421..6b30bb9d 100644
--- a/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook
+++ b/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook
@@ -24,7 +24,7 @@
 <para
 >Toodud pildiga hakkamegi töötama. Käivita Chalk selle pildiga (see asub kataloogis <filename
 >$<envar
->KDEDIR</envar
+>TDEDIR</envar
 >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename
 >) ja salvesta see oma kodukataloogi (valides <guilabel
 >Salvesta pilt kui...</guilabel
diff --git a/koffice-i18n-et/docs/koffice/kchart/index.docbook b/koffice-i18n-et/docs/koffice/kchart/index.docbook
index 1ff28244..9d7e280e 100644
--- a/koffice-i18n-et/docs/koffice/kchart/index.docbook
+++ b/koffice-i18n-et/docs/koffice/kchart/index.docbook
@@ -70,7 +70,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdeutils</keyword>
+>tdeutils</keyword>
 <keyword
 >Kchart</keyword>
 <keyword
diff --git a/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook
index 70be1f38..36f7cf6c 100644
--- a/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook
+++ b/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook
@@ -37,21 +37,21 @@
 <sect1 id="a11y-install">
 <title
 >Mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamine</title>
 <indexterm
 ><primary
->kdeaccessibility</primary
+>tdeaccessibility</primary
 ></indexterm>
 <para
 >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamisel. Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > kuulub &kde; projekti <ulink url="http://www.kde.org"
 >http://www.kde.org</ulink
 > koosseisu. Paketi <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para>
 
 <para
@@ -134,7 +134,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag"
 >KMagnifier</ulink
 >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice
@@ -163,7 +163,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kpresenter;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd"
 >KTTS käsiraamat</ulink
 >. &kpresenter;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice
diff --git a/koffice-i18n-et/docs/koffice/kspread/a11y.docbook b/koffice-i18n-et/docs/koffice/kspread/a11y.docbook
index a531dad1..70ee4b4a 100644
--- a/koffice-i18n-et/docs/koffice/kspread/a11y.docbook
+++ b/koffice-i18n-et/docs/koffice/kspread/a11y.docbook
@@ -35,21 +35,21 @@
 <sect1 id="a11y-install">
 <title
 >Mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamine</title>
 <indexterm
 ><primary
->kdeaccessibility</primary
+>tdeaccessibility</primary
 ></indexterm>
 <para
 >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamisel. Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > kuulub &kde; projekti <ulink url="http://www.kde.org"
 >http://www.kde.org</ulink
 > koosseisu. Paketi <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para>
 
 <para
@@ -124,7 +124,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag"
 >&kmagnifier;</ulink
 >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice
@@ -153,7 +153,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kspread;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd"
 >KTTS käsiraamat</ulink
 >. &kspread;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice
diff --git a/koffice-i18n-et/docs/koffice/kugar/index.docbook b/koffice-i18n-et/docs/koffice/kugar/index.docbook
index 7908f929..d614ac89 100644
--- a/koffice-i18n-et/docs/koffice/kugar/index.docbook
+++ b/koffice-i18n-et/docs/koffice/kugar/index.docbook
@@ -98,7 +98,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdeutils</keyword>
+>tdeutils</keyword>
 <keyword
 >kugar</keyword>
 <keyword
diff --git a/koffice-i18n-et/docs/koffice/kword/a11y.docbook b/koffice-i18n-et/docs/koffice/kword/a11y.docbook
index 465a7d15..33034c7a 100644
--- a/koffice-i18n-et/docs/koffice/kword/a11y.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/a11y.docbook
@@ -37,21 +37,21 @@
 <sect1 id="a11y-install">
 <title
 >Mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamine</title>
 <indexterm
 ><primary
->kdeaccessibility</primary
+>tdeaccessibility</primary
 ></indexterm>
 <para
 >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > paigaldamisel. Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > kuulub &kde; projekti <ulink url="http://www.kde.org"
 >http://www.kde.org</ulink
 > koosseisu. Paketi <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para>
 
 <para
@@ -126,7 +126,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag"
 >&kmagnifier;</ulink
 >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice
@@ -155,7 +155,7 @@
 ></indexterm>
 <para
 >Moodul <command
->kdeaccessibility</command
+>tdeaccessibility</command
 > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kword;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd"
 >KTTS käsiraamat</ulink
 >. &kword;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice
diff --git a/koffice-i18n-et/docs/koffice/kword/index.docbook b/koffice-i18n-et/docs/koffice/kword/index.docbook
index e31b19db..9d123d79 100644
--- a/koffice-i18n-et/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/index.docbook
@@ -1518,7 +1518,7 @@
 
 <listitem>
 <para
->&kde; 3.3.0 teegid (kdelibs) ja &kde; 3.3.0 baaspakett (kdebase). Neid saab hankida <ulink url="http://www.kde.org"
+>&kde; 3.3.0 teegid (tdelibs) ja &kde; 3.3.0 baaspakett (tdebase). Neid saab hankida <ulink url="http://www.kde.org"
 >&kde; veebileheküljelt</ulink
 >.</para>
 <tip
diff --git a/koffice-i18n-et/messages/koffice/desktop_koffice.po b/koffice-i18n-et/messages/koffice/desktop_koffice.po
index cbbe8c55..015780af 100644
--- a/koffice-i18n-et/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-et/messages/koffice/desktop_koffice.po
@@ -574,7 +574,7 @@ msgstr "Name=Konteinervidinad"
 msgid "Name=Basic Widgets"
 msgstr "Name=Standardvidinad"
 
-#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3
+#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3
 msgid "Name=Form Designer KDevelop Plugin"
 msgstr "Name=Vormikujundaja KDevelopi plugin"
 
@@ -1892,11 +1892,11 @@ msgstr "Name=KOffice'i tekstitöötluse komponent"
 msgid "GenericName=Text Documents"
 msgstr "GenericName=Tekstidokumendid"
 
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6
 msgid "Name=KDE Addressbook Plugin"
 msgstr "Name=KDE aadressiraamatu plugin"
 
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55
 msgid ""
 "Comment=This datasource type lets you use your KDE Address Book entries."
 msgstr ""
diff --git a/koffice-i18n-et/messages/koffice/kformdesigner.po b/koffice-i18n-et/messages/koffice/kformdesigner.po
index f86c1899..a9530463 100644
--- a/koffice-i18n-et/messages/koffice/kformdesigner.po
+++ b/koffice-i18n-et/messages/koffice/kformdesigner.po
@@ -23,36 +23,36 @@ msgstr "KFormDesigner"
 msgid "Document to open"
 msgstr "Avatav dokument"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
+#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
 msgid "Form Designer Part"
 msgstr "Vormikujundaja komponent"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
+#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
 msgid "Objects"
 msgstr "Objektid"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
+#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
 msgid "Clear Widget Contents"
 msgstr "Puhasta vidinate sisu"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
+#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
 msgid "Delete Widget"
 msgstr "Kustuta vidin"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
+#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
 msgid "Preview Form"
 msgstr "Vormi eelvaatlus"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
+#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
 #: test/kfd_part.cpp:218
 msgid "Edit Tab Order"
 msgstr "Muuda kaartide järjekorda"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
+#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
 msgid "Edit Pixmap Collection"
 msgstr "Muuda pildikogu"
 
-#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216
+#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216
 #: test/kfd_part.cpp:220
 msgid "Edit Form Connections"
 msgstr "Muuda vormi ühendusi"
@@ -93,75 +93,75 @@ msgstr "Püstiselt eralda&jas"
 msgid "&Ungroup Widgets"
 msgstr "Lõh&u vidinate rühm"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
+#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
 msgid "Bring Widget to Front"
 msgstr "Too vidin ette"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
+#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
 msgid "Send Widget to Back"
 msgstr "Saada vidin taha"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
+#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
 msgid "Align Widgets' Positions"
 msgstr "Joonda vidinate asukohad"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
+#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
 msgid "To Left"
 msgstr "Vasakule"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
+#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
 msgid "To Right"
 msgstr "Paremale"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
+#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
 msgid "To Top"
 msgstr "Üles"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
+#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
 msgid "To Bottom"
 msgstr "Alla"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235
+#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235
 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252
 msgid "To Grid"
 msgstr "Alusvõrgule"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
+#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
 msgid "Adjust Widgets' Sizes"
 msgstr "Kohanda vidinate suurust"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
+#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
 msgid "To Fit"
 msgstr "Sobivaks"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
+#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
 msgid "To Shortest"
 msgstr "Lühimaks"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
+#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
 msgid "To Tallest"
 msgstr "Pikimaks"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
+#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
 msgid "To Narrowest"
 msgstr "Kitsaimaks"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
+#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
 msgid "To Widest"
 msgstr "Kõige laiemaks"
 
 #: factories/stdwidgetfactory.cpp:111 form.cpp:134
-#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
+#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
 msgid "Form"
 msgstr "Vorm"
 
-#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279
-#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
+#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279
+#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
 #: test/kfd_part.cpp:334
 msgid "*.ui|Qt Designer UI Files"
 msgstr "*.ui|Qt Disaineri UI-failid"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
+#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
 msgid ""
 "The form \"%1\" has been modified.\n"
 "Do you want to save your changes or discard them?"
@@ -169,7 +169,7 @@ msgstr ""
 "Vormi \"%1\" on muudetud.\n"
 "Kas soovid muudatused salvestada või unustada?"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
+#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
 msgid "Close Form"
 msgstr "Vormi sulgemine"
 
@@ -1127,19 +1127,19 @@ msgstr "Uus element"
 msgid "Sub Item"
 msgstr "Alamelement"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:218
+#: tdevelop_plugin/kfd_kdev_part.cpp:218
 msgid "Lay Out Widgets &Horizontally"
 msgstr "Pai&guta vidinad rõhtsalt"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:219
+#: tdevelop_plugin/kfd_kdev_part.cpp:219
 msgid "Lay Out Widgets &Vertically"
 msgstr "Paiguta vidinad &püstiselt"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:220
+#: tdevelop_plugin/kfd_kdev_part.cpp:220
 msgid "Lay Out Widgets in &Grid"
 msgstr "Paiguta vidinad alus&võrgule"
 
-#: kdevelop_plugin/kfd_kdev_part.cpp:221
+#: tdevelop_plugin/kfd_kdev_part.cpp:221
 msgid "&Break Layout"
 msgstr "&Katkesta paigutus"