Additional renaming of kde to tde

28 files changed, 107 insertions, 107 deletions

diff --git a/ChangeLog b/ChangeLog
index b644bc6..8ecef3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -601,7 +601,7 @@ Changes since version 0.6.4
 - Changed regexp; mplayer rc3 changed "Start playing" to "Starting playback"
 - Fix uncheck of subtitle/language DVD menu
 Changes since version 0.6.3a
-- View Arts Control menu option (kdemultimedia)
+- View Arts Control menu option (tdemultimedia)
 - disable screensaver in fullscreen mode
 - more user feedback; BrowserExtension::infoMessage for cache fill
 - start hiding buttons when the movie starts, not when mplayer is executed
diff --git a/acinclude.m4 b/acinclude.m4
index 6849db9..1c0ba3a 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.
 
 # 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!
@@ -378,7 +378,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
 
@@ -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.
 ])
@@ -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}/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"
@@ -1824,7 +1824,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
@@ -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"
 
@@ -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
 ])
 
@@ -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,7 +4946,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],
@@ -4993,9 +4993,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`
@@ -5660,7 +5660,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
@@ -5680,7 +5680,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
@@ -5917,9 +5917,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 59ce251..159b33d 100644
--- a/configure.in
+++ b/configure.in
@@ -271,13 +271,13 @@ AC_MSG_CHECKING([for KDE version])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
-kdeversion_safe_LIBS="$LIBS"
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
+tdeversion_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $all_includes"
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 3, 91 ) )
 #error KDE 3.3
 #endif
@@ -288,7 +288,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
 #error KDE 3.2
 #endif
@@ -299,7 +299,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 1, 90 ) )
 #error KDE 3.1
 #endif
@@ -309,8 +309,8 @@ AC_COMPILE_IFELSE([
     need_trinity1_compat="yes"
 )
 
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
-LIBS="$kdeversion_safe_LIBS"
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
+LIBS="$tdeversion_safe_LIBS"
 AC_LANG_RESTORE
 
 if test "$need_trinity2_compat" = "yes"; then
diff --git a/configure.in.in b/configure.in.in
index 49b9228..96921cf 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -206,13 +206,13 @@ AC_MSG_CHECKING([for KDE version])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
-kdeversion_safe_LIBS="$LIBS"
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
+tdeversion_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $all_includes"
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 3, 91 ) )
 #error KDE 3.3
 #endif
@@ -223,7 +223,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
 #error KDE 3.2
 #endif
@@ -234,7 +234,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 1, 90 ) )
 #error KDE 3.1
 #endif
@@ -244,8 +244,8 @@ AC_COMPILE_IFELSE([
     need_trinity1_compat="yes"
 )
 
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
-LIBS="$kdeversion_safe_LIBS"
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
+LIBS="$tdeversion_safe_LIBS"
 AC_LANG_RESTORE
 
 if test "$need_trinity2_compat" = "yes"; then
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
index a1f5928..45dab4d 100644
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -74,7 +74,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
index 50a76c7..1b844ad 100644
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
@@ -84,7 +84,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 6aa9e58..52c4a62 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -52,7 +52,7 @@
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kdemultimedia</keyword>
+<keyword>tdemultimedia</keyword>
 <keyword>MPlayer</keyword>
 <keyword>konqueror</keyword>
 <keyword>video</keyword>
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
index 2ee031c..90b2980 100644
--- a/doc/es/index.docbook
+++ b/doc/es/index.docbook
@@ -84,7 +84,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/et/index.docbook b/doc/et/index.docbook
index cc589a3..26aa3bc 100644
--- a/doc/et/index.docbook
+++ b/doc/et/index.docbook
@@ -84,7 +84,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook
index ae2137e..ef33321 100644
--- a/doc/fr/index.docbook
+++ b/doc/fr/index.docbook
@@ -70,7 +70,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index 8d28856..592f0b9 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -88,7 +88,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
index a4a99f4..05d5ea0 100644
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -70,7 +70,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
index 3bf8382..59744f1 100644
--- a/doc/pt/index.docbook
+++ b/doc/pt/index.docbook
@@ -88,7 +88,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 7be8db4..57f9e92 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -84,7 +84,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >MPlayer</keyword>
 <keyword
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 5c8fb22..8a58289 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -90,7 +90,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >Mplayer</keyword>
 <keyword
diff --git a/po/ca.po b/po/ca.po
index 5437b9d..8992e68 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-02-26 12:53+0100\n"
 "Last-Translator: Antoni Bella Pérez <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index 1ad0459..879d511 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-03-27 13:52+0200\n"
 "Last-Translator: Thomas Ohms <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
+"Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi.po b/po/fi.po
index 8f81eaa..f1b6758 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2006-04-14 22:25+0300\n"
 "Last-Translator: Niklas Laxström <[email protected]>\n"
-"Language-Team: Finnish <[email protected]>\n"
+"Language-Team: Finnish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index 30581d8..d53f518 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-12 20:45+0200\n"
 "Last-Translator: Federico Zenith <[email protected]>\n"
-"Language-Team: Italian <[email protected]>\n"
+"Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/lt.po b/po/lt.po
index 28dac37..7395229 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -113,7 +113,7 @@ msgid "Clear &History"
 msgstr ""
 "#-#-#-#-#  konsole.po (konsole)  #-#-#-#-#\n"
 "Išva&lyti istoriją\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Išvalyti &istoriją"
 
 #: kmplayerapp.cpp:560 kmplayerapp.cpp:625 kmplayerapp.cpp:627
@@ -392,7 +392,7 @@ msgstr ""
 "Išeiti\n"
 "#-#-#-#-#  kmail.po (kmail)  #-#-#-#-#\n"
 "Išeiti\n"
-"#-#-#-#-#  kdevelop.po (kdevelop)  #-#-#-#-#\n"
+"#-#-#-#-#  tdevelop.po (tdevelop)  #-#-#-#-#\n"
 "Išeiti\n"
 "#-#-#-#-#  kppp.po (kppp)  #-#-#-#-#\n"
 "Baigti"
@@ -536,7 +536,7 @@ msgstr ""
 #, fuzzy
 msgid "&Next"
 msgstr ""
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "&Kitas\n"
 "#-#-#-#-#  digikam.po (digikam)  #-#-#-#-#\n"
 "&Kitas\n"
@@ -753,7 +753,7 @@ msgstr ""
 "Pasirinktas\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Pasirinktas\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Pasirinkta\n"
 "#-#-#-#-#  libkscan.po (libkscan)  #-#-#-#-#\n"
 "Pasirinktas\n"
@@ -993,7 +993,7 @@ msgstr ""
 "Nežinoma\n"
 "#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
 "Nežinoma\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Nežinoma\n"
 "#-#-#-#-#  amarok.po (amarok)  #-#-#-#-#\n"
 "Nežinoma\n"
@@ -1021,7 +1021,7 @@ msgstr ""
 "Nežinoma\n"
 "#-#-#-#-#  kmail.po (kmail)  #-#-#-#-#\n"
 "Nežinoma\n"
-"#-#-#-#-#  libkdenetwork.po (libkdenetwork)  #-#-#-#-#\n"
+"#-#-#-#-#  libtdenetwork.po (libtdenetwork)  #-#-#-#-#\n"
 "Nežinomas\n"
 "#-#-#-#-#  kbabel.po (kbabel)  #-#-#-#-#\n"
 "Nežinomas\n"
@@ -1213,7 +1213,7 @@ msgstr ""
 "Vardas:\n"
 "#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
 "Vardas:\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Vardas:\n"
 "#-#-#-#-#  katepart.po (katepart)  #-#-#-#-#\n"
 "Vardas:\n"
@@ -1350,7 +1350,7 @@ msgstr ""
 "Bendrieji\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Bendros\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Bendros\n"
 "#-#-#-#-#  kfilereplace.po (kfilereplace)  #-#-#-#-#\n"
 "Bendra\n"
@@ -2039,7 +2039,7 @@ msgstr ""
 "Pasirinktas\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Pasirinktas\n"
-"#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
+"#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Pasirinkta\n"
 "#-#-#-#-#  libkscan.po (libkscan)  #-#-#-#-#\n"
 "Pasirinktas\n"
diff --git a/po/nl.po b/po/nl.po
index 4d5c649..e5d4246 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-12 18:13+0200\n"
 "Last-Translator: Rinse de Vries <[email protected]>\n"
-"Language-Team: Dutch <[email protected]>\n"
+"Language-Team: Dutch <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pl.po b/po/pl.po
index 27f9b70..092a303 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,7 +4,7 @@
 # translation of kmplayer.po to
 #
 # Krzysztof Pawlak <[email protected]>, 2004, 2005, 2006.
-# Michal Rudolf <[email protected]>, 2004.
+# Michal Rudolf <[email protected]>, 2004.
 # Krzysztof Lichota <[email protected]>, 2005.
 # Copyright (C) 2003,2004, 2005, 2006 Free Software Foundation, Inc.
 msgid ""
diff --git a/po/pt.po b/po/pt.po
index b9b67b5..75c785a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-14 14:51+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
-"Language-Team: pt <[email protected]>\n"
+"Language-Team: pt <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c6db951..55b78fd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-01-13 10:53-0200\n"
 "Last-Translator: Jose Monteiro <[email protected]>\n"
-"Language-Team: Brazilian Portuguese <[email protected]>\n"
+"Language-Team: Brazilian Portuguese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/xx.po b/po/xx.po
index 48a6478..4f79595 100644
--- a/po/xx.po
+++ b/po/xx.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-11 15:59+0000\n"
 "Last-Translator: transxx program <[email protected]>\n"
-"Language-Team: Test Language <[email protected]>\n"
+"Language-Team: Test Language <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 16c0c48..3996635 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -36,7 +36,7 @@
 #include <tqmetaobject.h>
 
 // include files for KDE
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 68de065..702c8f4 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -52,7 +52,7 @@
 #include <kaction.h>
 #include <kiconloader.h>
 #include <klistview.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if KDE_IS_VERSION(3, 1, 90)
 #include <kinputdialog.h>
 #endif
diff --git a/src/pref.cpp b/src/pref.cpp
index 582ff65..423102e 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -48,7 +48,7 @@
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <kcombobox.h>
 #include <kcolorbutton.h>
 #include <kurlrequester.h>