Initial kde-tde rename

145 files changed, 2783 insertions, 2783 deletions

diff --git a/tde-i18n-ja/Makefile.in b/tde-i18n-ja/Makefile.in
index ca20e6283c8..250b065b011 100644
--- a/tde-i18n-ja/Makefile.in
+++ b/tde-i18n-ja/Makefile.in
@@ -176,7 +176,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/tde-i18n-ja/acinclude.m4 b/tde-i18n-ja/acinclude.m4
index 46ad205e449..7d9fdee4132 100644
--- a/tde-i18n-ja/acinclude.m4
+++ b/tde-i18n-ja/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,14 +371,14 @@ 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
 
@@ -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
@@ -1226,7 +1226,7 @@ if test $kde_qtver = 4; then
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
 fi
 if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
   if test -z "$PKG_CONFIG"; then
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   fi
@@ -1426,7 +1426,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
     ])
 
@@ -1475,7 +1475,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
 done
 if test -z "$PKG_CONFIG"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -1668,11 +1668,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,7 +1809,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="libkio.la"
@@ -1829,8 +1829,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 "$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"
@@ -1848,7 +1848,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
@@ -1863,7 +1863,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"
 
@@ -2088,12 +2088,12 @@ 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_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2102,9 +2102,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2113,8 +2113,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2123,13 +2123,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   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_KFILE, "-lkfile $(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_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
@@ -2194,7 +2194,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
@@ -2513,7 +2513,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
 ])
 
@@ -3527,9 +3527,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>
@@ -3537,26 +3537,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
 ])
 
@@ -4581,7 +4581,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)
@@ -4971,7 +4971,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],
@@ -5018,9 +5018,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`
@@ -5686,7 +5686,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
@@ -5706,7 +5706,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
@@ -5943,9 +5943,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/tde-i18n-ja/configure b/tde-i18n-ja/configure
index d149d6d77af..a7bd9ca1ee5 100755
--- a/tde-i18n-ja/configure
+++ b/tde-i18n-ja/configure
@@ -680,7 +680,7 @@ kde_templatesdir
 kde_servicesdir
 kde_servicetypesdir
 kde_moduledir
-kdeinitdir
+tdeinitdir
 kde_styledir
 kde_widgetdir
 LN_S
@@ -2060,7 +2060,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=kde-i18n-ja
+ PACKAGE=tde-i18n-ja
  VERSION="3.5.10"
 
 
@@ -2602,7 +2602,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -2614,11 +2614,11 @@ echo "${ECHO_T}yes" >&6; }
 else
   { { echo "$as_me:$LINENO: 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." >&5
 echo "$as_me: 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." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2904,7 +2904,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -2916,11 +2916,11 @@ echo "${ECHO_T}yes" >&6; }
 else
   { { echo "$as_me:$LINENO: 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." >&5
 echo "$as_me: 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." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3895,13 +3895,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       { { echo "$as_me:$LINENO: 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.
                     " >&5
-echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+echo "$as_me: 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.
                     " >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -3970,7 +3970,7 @@ fi
 
 
 
-kdeinitdir='$(kde_moduledir)'
+tdeinitdir='$(kde_moduledir)'
 
 
 
@@ -4125,173 +4125,173 @@ ac_config_files="$ac_config_files docs/Makefile"
 
 ac_config_files="$ac_config_files docs/common/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/arts/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/arts/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/bell/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/bell/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/clock/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/clock/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/colors/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/colors/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/cookies/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/cookies/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/crypto/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/crypto/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/desktop/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/desktop/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/ebrowsing/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/ebrowsing/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/email/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/email/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/filetypes/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/filetypes/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/fonts/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/fonts/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/icons/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/icons/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmcss/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmcss/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmkonsole/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmkonsole/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmlaunch/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmlaunch/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmnotify/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmnotify/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmsmserver/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmsmserver/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kcmtaskbar/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kcmtaskbar/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/keyboard/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/keyboard/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/keys/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/keys/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/khtml/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/khtml/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kthememgr/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/kthememgr/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/kwindecoration/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/twindecoration/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/mouse/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/mouse/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/netpref/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/netpref/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/passwords/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/passwords/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/proxy/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/proxy/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/screensaver/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/screensaver/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/smb/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/smb/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/spellchecking/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/spellchecking/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/useragent/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/useragent/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kcontrol/windowmanagement/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kcontrol/windowmanagement/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/khelpcenter/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/khelpcenter/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/khelpcenter/faq/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/khelpcenter/faq/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/dma/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/dma/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/memory/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/memory/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/partitions/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/partitions/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/pci/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/pci/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/pcmcia/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/pcmcia/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/processor/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/processor/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/protocols/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/protocols/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/samba/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/samba/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/scsi/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/scsi/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/sound/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/sound/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/usb/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/usb/Makefile"
 
-ac_config_files="$ac_config_files docs/kdebase/kinfocenter/xserver/Makefile"
+ac_config_files="$ac_config_files docs/tdebase/kinfocenter/xserver/Makefile"
 
-ac_config_files="$ac_config_files docs/kdegames/Makefile"
+ac_config_files="$ac_config_files docs/tdegames/Makefile"
 
-ac_config_files="$ac_config_files docs/kdegames/kshisen/Makefile"
+ac_config_files="$ac_config_files docs/tdegames/kshisen/Makefile"
 
-ac_config_files="$ac_config_files docs/kdemultimedia/Makefile"
+ac_config_files="$ac_config_files docs/tdemultimedia/Makefile"
 
-ac_config_files="$ac_config_files docs/kdemultimedia/kcontrol/Makefile"
+ac_config_files="$ac_config_files docs/tdemultimedia/kcontrol/Makefile"
 
-ac_config_files="$ac_config_files docs/kdemultimedia/kcontrol/kmixcfg/Makefile"
+ac_config_files="$ac_config_files docs/tdemultimedia/kcontrol/kmixcfg/Makefile"
 
-ac_config_files="$ac_config_files docs/kdepim/Makefile"
+ac_config_files="$ac_config_files docs/tdepim/Makefile"
 
-ac_config_files="$ac_config_files docs/kdepim/kcontrol/Makefile"
+ac_config_files="$ac_config_files docs/tdepim/kcontrol/Makefile"
 
-ac_config_files="$ac_config_files docs/kdepim/kcontrol/kalarmd/Makefile"
+ac_config_files="$ac_config_files docs/tdepim/kcontrol/kalarmd/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kcontrol/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kcontrol/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kcontrol/laptop/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kcontrol/laptop/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kcontrol/powerctrl/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kcontrol/powerctrl/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kgpg/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kgpg/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kinfocenter/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kinfocenter/Makefile"
 
-ac_config_files="$ac_config_files docs/kdeutils/kinfocenter/blockdevices/Makefile"
+ac_config_files="$ac_config_files docs/tdeutils/kinfocenter/blockdevices/Makefile"
 
 ac_config_files="$ac_config_files messages/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeaccessibility/Makefile"
+ac_config_files="$ac_config_files messages/tdeaccessibility/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeaddons/Makefile"
+ac_config_files="$ac_config_files messages/tdeaddons/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeadmin/Makefile"
+ac_config_files="$ac_config_files messages/tdeadmin/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeartwork/Makefile"
+ac_config_files="$ac_config_files messages/tdeartwork/Makefile"
 
-ac_config_files="$ac_config_files messages/kdebase/Makefile"
+ac_config_files="$ac_config_files messages/tdebase/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeedu/Makefile"
+ac_config_files="$ac_config_files messages/tdeedu/Makefile"
 
-ac_config_files="$ac_config_files messages/kdegames/Makefile"
+ac_config_files="$ac_config_files messages/tdegames/Makefile"
 
-ac_config_files="$ac_config_files messages/kdegraphics/Makefile"
+ac_config_files="$ac_config_files messages/tdegraphics/Makefile"
 
-ac_config_files="$ac_config_files messages/kdelibs/Makefile"
+ac_config_files="$ac_config_files messages/tdelibs/Makefile"
 
-ac_config_files="$ac_config_files messages/kdemultimedia/Makefile"
+ac_config_files="$ac_config_files messages/tdemultimedia/Makefile"
 
-ac_config_files="$ac_config_files messages/kdenetwork/Makefile"
+ac_config_files="$ac_config_files messages/tdenetwork/Makefile"
 
-ac_config_files="$ac_config_files messages/kdepim/Makefile"
+ac_config_files="$ac_config_files messages/tdepim/Makefile"
 
-ac_config_files="$ac_config_files messages/kdesdk/Makefile"
+ac_config_files="$ac_config_files messages/tdesdk/Makefile"
 
-ac_config_files="$ac_config_files messages/kdetoys/Makefile"
+ac_config_files="$ac_config_files messages/tdetoys/Makefile"
 
-ac_config_files="$ac_config_files messages/kdeutils/Makefile"
+ac_config_files="$ac_config_files messages/tdeutils/Makefile"
 
-ac_config_files="$ac_config_files messages/kdevelop/Makefile"
+ac_config_files="$ac_config_files messages/tdevelop/Makefile"
 
-ac_config_files="$ac_config_files messages/kdewebdev/Makefile"
+ac_config_files="$ac_config_files messages/tdewebdev/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4858,90 +4858,90 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/common/Makefile") CONFIG_FILES="$CONFIG_FILES docs/common/Makefile" ;;
-    "docs/kdebase/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/Makefile" ;;
-    "docs/kdebase/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/Makefile" ;;
-    "docs/kdebase/kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/arts/Makefile" ;;
-    "docs/kdebase/kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/bell/Makefile" ;;
-    "docs/kdebase/kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/clock/Makefile" ;;
-    "docs/kdebase/kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/colors/Makefile" ;;
-    "docs/kdebase/kcontrol/cookies/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/cookies/Makefile" ;;
-    "docs/kdebase/kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/crypto/Makefile" ;;
-    "docs/kdebase/kcontrol/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/desktop/Makefile" ;;
-    "docs/kdebase/kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/ebrowsing/Makefile" ;;
-    "docs/kdebase/kcontrol/email/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/email/Makefile" ;;
-    "docs/kdebase/kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/filetypes/Makefile" ;;
-    "docs/kdebase/kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/fonts/Makefile" ;;
-    "docs/kdebase/kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/icons/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmcss/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmcss/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmkonsole/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmkonsole/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmlaunch/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmlaunch/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmnotify/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmnotify/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmsmserver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmsmserver/Makefile" ;;
-    "docs/kdebase/kcontrol/kcmtaskbar/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kcmtaskbar/Makefile" ;;
-    "docs/kdebase/kcontrol/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/keyboard/Makefile" ;;
-    "docs/kdebase/kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/keys/Makefile" ;;
-    "docs/kdebase/kcontrol/khtml/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/khtml/Makefile" ;;
-    "docs/kdebase/kcontrol/kthememgr/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kthememgr/Makefile" ;;
-    "docs/kdebase/kcontrol/kwindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/kwindecoration/Makefile" ;;
-    "docs/kdebase/kcontrol/mouse/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/mouse/Makefile" ;;
-    "docs/kdebase/kcontrol/netpref/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/netpref/Makefile" ;;
-    "docs/kdebase/kcontrol/passwords/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/passwords/Makefile" ;;
-    "docs/kdebase/kcontrol/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/proxy/Makefile" ;;
-    "docs/kdebase/kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/screensaver/Makefile" ;;
-    "docs/kdebase/kcontrol/smb/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/smb/Makefile" ;;
-    "docs/kdebase/kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/spellchecking/Makefile" ;;
-    "docs/kdebase/kcontrol/useragent/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/useragent/Makefile" ;;
-    "docs/kdebase/kcontrol/windowmanagement/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kcontrol/windowmanagement/Makefile" ;;
-    "docs/kdebase/khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/khelpcenter/Makefile" ;;
-    "docs/kdebase/khelpcenter/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/khelpcenter/faq/Makefile" ;;
-    "docs/kdebase/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/Makefile" ;;
-    "docs/kdebase/kinfocenter/dma/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/dma/Makefile" ;;
-    "docs/kdebase/kinfocenter/memory/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/memory/Makefile" ;;
-    "docs/kdebase/kinfocenter/partitions/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/partitions/Makefile" ;;
-    "docs/kdebase/kinfocenter/pci/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/pci/Makefile" ;;
-    "docs/kdebase/kinfocenter/pcmcia/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/pcmcia/Makefile" ;;
-    "docs/kdebase/kinfocenter/processor/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/processor/Makefile" ;;
-    "docs/kdebase/kinfocenter/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/protocols/Makefile" ;;
-    "docs/kdebase/kinfocenter/samba/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/samba/Makefile" ;;
-    "docs/kdebase/kinfocenter/scsi/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/scsi/Makefile" ;;
-    "docs/kdebase/kinfocenter/sound/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/sound/Makefile" ;;
-    "docs/kdebase/kinfocenter/usb/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/usb/Makefile" ;;
-    "docs/kdebase/kinfocenter/xserver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdebase/kinfocenter/xserver/Makefile" ;;
-    "docs/kdegames/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdegames/Makefile" ;;
-    "docs/kdegames/kshisen/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdegames/kshisen/Makefile" ;;
-    "docs/kdemultimedia/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdemultimedia/Makefile" ;;
-    "docs/kdemultimedia/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdemultimedia/kcontrol/Makefile" ;;
-    "docs/kdemultimedia/kcontrol/kmixcfg/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdemultimedia/kcontrol/kmixcfg/Makefile" ;;
-    "docs/kdepim/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdepim/Makefile" ;;
-    "docs/kdepim/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdepim/kcontrol/Makefile" ;;
-    "docs/kdepim/kcontrol/kalarmd/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdepim/kcontrol/kalarmd/Makefile" ;;
-    "docs/kdeutils/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/Makefile" ;;
-    "docs/kdeutils/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kcontrol/Makefile" ;;
-    "docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile" ;;
-    "docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile" ;;
-    "docs/kdeutils/kcontrol/laptop/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kcontrol/laptop/Makefile" ;;
-    "docs/kdeutils/kcontrol/powerctrl/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kcontrol/powerctrl/Makefile" ;;
-    "docs/kdeutils/kgpg/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kgpg/Makefile" ;;
-    "docs/kdeutils/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kinfocenter/Makefile" ;;
-    "docs/kdeutils/kinfocenter/blockdevices/Makefile") CONFIG_FILES="$CONFIG_FILES docs/kdeutils/kinfocenter/blockdevices/Makefile" ;;
+    "docs/tdebase/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/Makefile" ;;
+    "docs/tdebase/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/Makefile" ;;
+    "docs/tdebase/kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/arts/Makefile" ;;
+    "docs/tdebase/kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/bell/Makefile" ;;
+    "docs/tdebase/kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/clock/Makefile" ;;
+    "docs/tdebase/kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/colors/Makefile" ;;
+    "docs/tdebase/kcontrol/cookies/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/cookies/Makefile" ;;
+    "docs/tdebase/kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/crypto/Makefile" ;;
+    "docs/tdebase/kcontrol/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/desktop/Makefile" ;;
+    "docs/tdebase/kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/ebrowsing/Makefile" ;;
+    "docs/tdebase/kcontrol/email/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/email/Makefile" ;;
+    "docs/tdebase/kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/filetypes/Makefile" ;;
+    "docs/tdebase/kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/fonts/Makefile" ;;
+    "docs/tdebase/kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/icons/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmcss/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmcss/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmkonsole/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmkonsole/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmlaunch/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmlaunch/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmnotify/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmnotify/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmsmserver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmsmserver/Makefile" ;;
+    "docs/tdebase/kcontrol/kcmtaskbar/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kcmtaskbar/Makefile" ;;
+    "docs/tdebase/kcontrol/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/keyboard/Makefile" ;;
+    "docs/tdebase/kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/keys/Makefile" ;;
+    "docs/tdebase/kcontrol/khtml/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/khtml/Makefile" ;;
+    "docs/tdebase/kcontrol/kthememgr/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/kthememgr/Makefile" ;;
+    "docs/tdebase/kcontrol/twindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/twindecoration/Makefile" ;;
+    "docs/tdebase/kcontrol/mouse/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/mouse/Makefile" ;;
+    "docs/tdebase/kcontrol/netpref/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/netpref/Makefile" ;;
+    "docs/tdebase/kcontrol/passwords/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/passwords/Makefile" ;;
+    "docs/tdebase/kcontrol/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/proxy/Makefile" ;;
+    "docs/tdebase/kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/screensaver/Makefile" ;;
+    "docs/tdebase/kcontrol/smb/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/smb/Makefile" ;;
+    "docs/tdebase/kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/spellchecking/Makefile" ;;
+    "docs/tdebase/kcontrol/useragent/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/useragent/Makefile" ;;
+    "docs/tdebase/kcontrol/windowmanagement/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kcontrol/windowmanagement/Makefile" ;;
+    "docs/tdebase/khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/khelpcenter/Makefile" ;;
+    "docs/tdebase/khelpcenter/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/khelpcenter/faq/Makefile" ;;
+    "docs/tdebase/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/Makefile" ;;
+    "docs/tdebase/kinfocenter/dma/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/dma/Makefile" ;;
+    "docs/tdebase/kinfocenter/memory/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/memory/Makefile" ;;
+    "docs/tdebase/kinfocenter/partitions/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/partitions/Makefile" ;;
+    "docs/tdebase/kinfocenter/pci/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/pci/Makefile" ;;
+    "docs/tdebase/kinfocenter/pcmcia/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/pcmcia/Makefile" ;;
+    "docs/tdebase/kinfocenter/processor/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/processor/Makefile" ;;
+    "docs/tdebase/kinfocenter/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/protocols/Makefile" ;;
+    "docs/tdebase/kinfocenter/samba/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/samba/Makefile" ;;
+    "docs/tdebase/kinfocenter/scsi/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/scsi/Makefile" ;;
+    "docs/tdebase/kinfocenter/sound/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/sound/Makefile" ;;
+    "docs/tdebase/kinfocenter/usb/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/usb/Makefile" ;;
+    "docs/tdebase/kinfocenter/xserver/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdebase/kinfocenter/xserver/Makefile" ;;
+    "docs/tdegames/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdegames/Makefile" ;;
+    "docs/tdegames/kshisen/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdegames/kshisen/Makefile" ;;
+    "docs/tdemultimedia/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdemultimedia/Makefile" ;;
+    "docs/tdemultimedia/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdemultimedia/kcontrol/Makefile" ;;
+    "docs/tdemultimedia/kcontrol/kmixcfg/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdemultimedia/kcontrol/kmixcfg/Makefile" ;;
+    "docs/tdepim/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdepim/Makefile" ;;
+    "docs/tdepim/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdepim/kcontrol/Makefile" ;;
+    "docs/tdepim/kcontrol/kalarmd/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdepim/kcontrol/kalarmd/Makefile" ;;
+    "docs/tdeutils/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/Makefile" ;;
+    "docs/tdeutils/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kcontrol/Makefile" ;;
+    "docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile" ;;
+    "docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile" ;;
+    "docs/tdeutils/kcontrol/laptop/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kcontrol/laptop/Makefile" ;;
+    "docs/tdeutils/kcontrol/powerctrl/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kcontrol/powerctrl/Makefile" ;;
+    "docs/tdeutils/kgpg/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kgpg/Makefile" ;;
+    "docs/tdeutils/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kinfocenter/Makefile" ;;
+    "docs/tdeutils/kinfocenter/blockdevices/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/kinfocenter/blockdevices/Makefile" ;;
     "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
-    "messages/kdeaccessibility/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeaccessibility/Makefile" ;;
-    "messages/kdeaddons/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeaddons/Makefile" ;;
-    "messages/kdeadmin/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeadmin/Makefile" ;;
-    "messages/kdeartwork/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeartwork/Makefile" ;;
-    "messages/kdebase/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdebase/Makefile" ;;
-    "messages/kdeedu/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeedu/Makefile" ;;
-    "messages/kdegames/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdegames/Makefile" ;;
-    "messages/kdegraphics/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdegraphics/Makefile" ;;
-    "messages/kdelibs/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdelibs/Makefile" ;;
-    "messages/kdemultimedia/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdemultimedia/Makefile" ;;
-    "messages/kdenetwork/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdenetwork/Makefile" ;;
-    "messages/kdepim/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdepim/Makefile" ;;
-    "messages/kdesdk/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdesdk/Makefile" ;;
-    "messages/kdetoys/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdetoys/Makefile" ;;
-    "messages/kdeutils/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdeutils/Makefile" ;;
-    "messages/kdevelop/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdevelop/Makefile" ;;
-    "messages/kdewebdev/Makefile") CONFIG_FILES="$CONFIG_FILES messages/kdewebdev/Makefile" ;;
+    "messages/tdeaccessibility/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeaccessibility/Makefile" ;;
+    "messages/tdeaddons/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeaddons/Makefile" ;;
+    "messages/tdeadmin/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeadmin/Makefile" ;;
+    "messages/tdeartwork/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeartwork/Makefile" ;;
+    "messages/tdebase/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdebase/Makefile" ;;
+    "messages/tdeedu/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeedu/Makefile" ;;
+    "messages/tdegames/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdegames/Makefile" ;;
+    "messages/tdegraphics/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdegraphics/Makefile" ;;
+    "messages/tdelibs/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdelibs/Makefile" ;;
+    "messages/tdemultimedia/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdemultimedia/Makefile" ;;
+    "messages/tdenetwork/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdenetwork/Makefile" ;;
+    "messages/tdepim/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdepim/Makefile" ;;
+    "messages/tdesdk/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdesdk/Makefile" ;;
+    "messages/tdetoys/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdetoys/Makefile" ;;
+    "messages/tdeutils/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdeutils/Makefile" ;;
+    "messages/tdevelop/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdevelop/Makefile" ;;
+    "messages/tdewebdev/Makefile") CONFIG_FILES="$CONFIG_FILES messages/tdewebdev/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -5146,7 +5146,7 @@ kde_templatesdir!$kde_templatesdir$ac_delim
 kde_servicesdir!$kde_servicesdir$ac_delim
 kde_servicetypesdir!$kde_servicetypesdir$ac_delim
 kde_moduledir!$kde_moduledir$ac_delim
-kdeinitdir!$kdeinitdir$ac_delim
+tdeinitdir!$tdeinitdir$ac_delim
 kde_styledir!$kde_styledir$ac_delim
 kde_widgetdir!$kde_widgetdir$ac_delim
 LN_S!$LN_S$ac_delim
diff --git a/tde-i18n-ja/configure.in b/tde-i18n-ja/configure.in
index c649e6be656..da9a1da09ff 100644
--- a/tde-i18n-ja/configure.in
+++ b/tde-i18n-ja/configure.in
@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
 dnl =======================================================
 
 AC_INIT(messages/Makefile.am)
-AM_INIT_AUTOMAKE(kde-i18n-ja, "3.5.10")
+AM_INIT_AUTOMAKE(tde-i18n-ja, "3.5.10")
 AM_CONFIG_HEADER(config.h)
 AC_SUBST(AUTODIRS)
 AM_KDE_WITH_NLS
@@ -16,90 +16,90 @@ KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ docs/Makefile ])
 AC_CONFIG_FILES([ docs/common/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/arts/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/bell/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/clock/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/colors/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/cookies/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/crypto/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/desktop/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/ebrowsing/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/email/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/filetypes/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/fonts/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/icons/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmcss/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmkonsole/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmlaunch/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmnotify/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmsmserver/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kcmtaskbar/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/keyboard/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/keys/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/khtml/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kthememgr/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/kwindecoration/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/mouse/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/netpref/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/passwords/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/proxy/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/screensaver/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/smb/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/spellchecking/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/useragent/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kcontrol/windowmanagement/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/khelpcenter/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/khelpcenter/faq/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/dma/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/memory/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/partitions/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/pci/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/pcmcia/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/processor/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/protocols/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/samba/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/scsi/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/sound/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/usb/Makefile ])
-AC_CONFIG_FILES([ docs/kdebase/kinfocenter/xserver/Makefile ])
-AC_CONFIG_FILES([ docs/kdegames/Makefile ])
-AC_CONFIG_FILES([ docs/kdegames/kshisen/Makefile ])
-AC_CONFIG_FILES([ docs/kdemultimedia/Makefile ])
-AC_CONFIG_FILES([ docs/kdemultimedia/kcontrol/Makefile ])
-AC_CONFIG_FILES([ docs/kdemultimedia/kcontrol/kmixcfg/Makefile ])
-AC_CONFIG_FILES([ docs/kdepim/Makefile ])
-AC_CONFIG_FILES([ docs/kdepim/kcontrol/Makefile ])
-AC_CONFIG_FILES([ docs/kdepim/kcontrol/kalarmd/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kcontrol/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kcontrol/laptop/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kcontrol/powerctrl/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kgpg/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kinfocenter/Makefile ])
-AC_CONFIG_FILES([ docs/kdeutils/kinfocenter/blockdevices/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/arts/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/bell/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/clock/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/colors/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/cookies/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/crypto/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/desktop/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/ebrowsing/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/email/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/filetypes/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/fonts/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/icons/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmcss/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmkonsole/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmlaunch/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmnotify/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmsmserver/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kcmtaskbar/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/keyboard/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/keys/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/khtml/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/kthememgr/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/twindecoration/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/mouse/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/netpref/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/passwords/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/proxy/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/screensaver/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/smb/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/spellchecking/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/useragent/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kcontrol/windowmanagement/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/khelpcenter/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/khelpcenter/faq/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/dma/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/memory/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/partitions/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/pci/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/pcmcia/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/processor/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/protocols/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/samba/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/scsi/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/sound/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/usb/Makefile ])
+AC_CONFIG_FILES([ docs/tdebase/kinfocenter/xserver/Makefile ])
+AC_CONFIG_FILES([ docs/tdegames/Makefile ])
+AC_CONFIG_FILES([ docs/tdegames/kshisen/Makefile ])
+AC_CONFIG_FILES([ docs/tdemultimedia/Makefile ])
+AC_CONFIG_FILES([ docs/tdemultimedia/kcontrol/Makefile ])
+AC_CONFIG_FILES([ docs/tdemultimedia/kcontrol/kmixcfg/Makefile ])
+AC_CONFIG_FILES([ docs/tdepim/Makefile ])
+AC_CONFIG_FILES([ docs/tdepim/kcontrol/Makefile ])
+AC_CONFIG_FILES([ docs/tdepim/kcontrol/kalarmd/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kcontrol/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kcontrol/laptop/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kcontrol/powerctrl/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kgpg/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kinfocenter/Makefile ])
+AC_CONFIG_FILES([ docs/tdeutils/kinfocenter/blockdevices/Makefile ])
 AC_CONFIG_FILES([ messages/Makefile ])
-AC_CONFIG_FILES([ messages/kdeaccessibility/Makefile ])
-AC_CONFIG_FILES([ messages/kdeaddons/Makefile ])
-AC_CONFIG_FILES([ messages/kdeadmin/Makefile ])
-AC_CONFIG_FILES([ messages/kdeartwork/Makefile ])
-AC_CONFIG_FILES([ messages/kdebase/Makefile ])
-AC_CONFIG_FILES([ messages/kdeedu/Makefile ])
-AC_CONFIG_FILES([ messages/kdegames/Makefile ])
-AC_CONFIG_FILES([ messages/kdegraphics/Makefile ])
-AC_CONFIG_FILES([ messages/kdelibs/Makefile ])
-AC_CONFIG_FILES([ messages/kdemultimedia/Makefile ])
-AC_CONFIG_FILES([ messages/kdenetwork/Makefile ])
-AC_CONFIG_FILES([ messages/kdepim/Makefile ])
-AC_CONFIG_FILES([ messages/kdesdk/Makefile ])
-AC_CONFIG_FILES([ messages/kdetoys/Makefile ])
-AC_CONFIG_FILES([ messages/kdeutils/Makefile ])
-AC_CONFIG_FILES([ messages/kdevelop/Makefile ])
-AC_CONFIG_FILES([ messages/kdewebdev/Makefile ])
+AC_CONFIG_FILES([ messages/tdeaccessibility/Makefile ])
+AC_CONFIG_FILES([ messages/tdeaddons/Makefile ])
+AC_CONFIG_FILES([ messages/tdeadmin/Makefile ])
+AC_CONFIG_FILES([ messages/tdeartwork/Makefile ])
+AC_CONFIG_FILES([ messages/tdebase/Makefile ])
+AC_CONFIG_FILES([ messages/tdeedu/Makefile ])
+AC_CONFIG_FILES([ messages/tdegames/Makefile ])
+AC_CONFIG_FILES([ messages/tdegraphics/Makefile ])
+AC_CONFIG_FILES([ messages/tdelibs/Makefile ])
+AC_CONFIG_FILES([ messages/tdemultimedia/Makefile ])
+AC_CONFIG_FILES([ messages/tdenetwork/Makefile ])
+AC_CONFIG_FILES([ messages/tdepim/Makefile ])
+AC_CONFIG_FILES([ messages/tdesdk/Makefile ])
+AC_CONFIG_FILES([ messages/tdetoys/Makefile ])
+AC_CONFIG_FILES([ messages/tdeutils/Makefile ])
+AC_CONFIG_FILES([ messages/tdevelop/Makefile ])
+AC_CONFIG_FILES([ messages/tdewebdev/Makefile ])
 AC_OUTPUT
 # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
 if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
diff --git a/tde-i18n-ja/docs/Makefile.in b/tde-i18n-ja/docs/Makefile.in
index f6e12843d78..91da56b52cf 100644
--- a/tde-i18n-ja/docs/Makefile.in
+++ b/tde-i18n-ja/docs/Makefile.in
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -187,7 +187,7 @@ xdg_menudir = @xdg_menudir@
 KDE_LANG = ja
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
-SUBDIRS =. common kdeutils kdepim kdegames kdemultimedia kdebase
+SUBDIRS =. common tdeutils tdepim tdegames tdemultimedia tdebase
 KDE_DOCS = AUTO
 KDE_MANS = AUTO
 #>- all: all-recursive
diff --git a/tde-i18n-ja/docs/common/Makefile.in b/tde-i18n-ja/docs/common/Makefile.in
index 7a41c21553d..3bee9186be3 100644
--- a/tde-i18n-ja/docs/common/Makefile.in
+++ b/tde-i18n-ja/docs/common/Makefile.in
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/tde-i18n-ja/docs/kdebase/Makefile.in b/tde-i18n-ja/docs/kdebase/Makefile.in
index 7075c78afa5..b421630acf2 100644
--- a/tde-i18n-ja/docs/kdebase/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase
+subdir = docs/tdebase
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/Makefile.in
index 93c21802afd..6113758638c 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol
+subdir = docs/tdebase/kcontrol
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -187,7 +187,7 @@ xdg_menudir = @xdg_menudir@
 KDE_LANG = ja
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
-SUBDIRS =. crypto kcmtaskbar keyboard filetypes useragent mouse clock spellchecking kcmkonsole icons cookies colors windowmanagement fonts bell kwindecoration kcmlaunch smb email netpref kthememgr proxy desktop khtml arts passwords ebrowsing kcmnotify keys kcmcss kcmsmserver screensaver
+SUBDIRS =. crypto kcmtaskbar keyboard filetypes useragent mouse clock spellchecking kcmkonsole icons cookies colors windowmanagement fonts bell twindecoration kcmlaunch smb email netpref kthememgr proxy desktop khtml arts passwords ebrowsing kcmnotify keys kcmcss kcmsmserver screensaver
 KDE_DOCS = kcontrol
 KDE_MANS = AUTO
 #>- all: all-recursive
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/arts/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/arts/Makefile.in
index a7935ba75b7..dc7fd0b765a 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/arts/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/arts/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/arts
+subdir = docs/tdebase/kcontrol/arts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/arts/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/arts/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/arts/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/arts/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/arts/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/arts/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/bell/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/bell/Makefile.in
index 436bf804b65..311dbe4133c 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/bell/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/bell/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/bell
+subdir = docs/tdebase/kcontrol/bell
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/bell/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/bell/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/bell/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/bell/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/bell/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/bell/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/clock/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/clock/Makefile.in
index c1fa8a7021b..b42ffd83afb 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/clock/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/clock/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/clock
+subdir = docs/tdebase/kcontrol/clock
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/clock/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/clock/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/clock/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/clock/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/clock/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/clock/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/colors/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/colors/Makefile.in
index dd436a8a546..65fc05e6da4 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/colors/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/colors/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/colors
+subdir = docs/tdebase/kcontrol/colors
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/colors/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/colors/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/colors/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/colors/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/colors/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/colors/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/cookies/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/cookies/Makefile.in
index e7691b9a653..7f6e3ef346c 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/cookies/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/cookies/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/cookies
+subdir = docs/tdebase/kcontrol/cookies
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/cookies/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/cookies/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/cookies/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/cookies/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/cookies/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/cookies/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/crypto/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/crypto/Makefile.in
index c0373a877ce..564dc5daeaa 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/crypto/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/crypto/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/crypto
+subdir = docs/tdebase/kcontrol/crypto
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/crypto/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/crypto/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/crypto/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/crypto/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/crypto/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/crypto/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/desktop/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/desktop/Makefile.in
index dad7e5f606f..5fb40d98b5c 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/desktop/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/desktop/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/desktop
+subdir = docs/tdebase/kcontrol/desktop
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/desktop/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/desktop/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/desktop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/desktop/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/desktop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/desktop/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/ebrowsing/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/ebrowsing/Makefile.in
index 532565c32fa..f27681e0764 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/ebrowsing/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/ebrowsing/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/ebrowsing
+subdir = docs/tdebase/kcontrol/ebrowsing
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/ebrowsing/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/ebrowsing/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/ebrowsing/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/ebrowsing/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/ebrowsing/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/ebrowsing/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/email/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/email/Makefile.in
index baebf191c8d..ce128518c7b 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/email/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/email/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/email
+subdir = docs/tdebase/kcontrol/email
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/email/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/email/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/email/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/email/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/email/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/email/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/filetypes/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/filetypes/Makefile.in
index 9700e19f21c..58b0b750041 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/filetypes/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/filetypes/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/filetypes
+subdir = docs/tdebase/kcontrol/filetypes
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/filetypes/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/filetypes/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/filetypes/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/filetypes/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/filetypes/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/filetypes/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/fonts/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/fonts/Makefile.in
index 042fbb11973..ff9eee6e578 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/fonts/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/fonts/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/fonts
+subdir = docs/tdebase/kcontrol/fonts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/fonts/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/fonts/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/fonts/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/fonts/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/fonts/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/fonts/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/icons/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/icons/Makefile.in
index 280cb424e53..00d1fbff6ec 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/icons/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/icons/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/icons
+subdir = docs/tdebase/kcontrol/icons
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/icons/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/icons/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/icons/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/icons/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/icons/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/icons/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/icons/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/icons/index.docbook
index b4f007c282a..5098ac85ed5 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/icons/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/icons/index.docbook
@@ -82,7 +82,7 @@
 
 <important
 ><para
->これらの設定は選択されているアイコンテーマに依存します。&kde;にはデフォルトでは、１つのアイコンテーマが含まれています。ハイカラーテーマです。なおkdeartworkパッケージには、ローカラーテーマやそれ以外のものが含まれています。</para
+>これらの設定は選択されているアイコンテーマに依存します。&kde;にはデフォルトでは、１つのアイコンテーマが含まれています。ハイカラーテーマです。なおtdeartworkパッケージには、ローカラーテーマやそれ以外のものが含まれています。</para
 ></important>
 
 </sect2>
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmcss/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmcss/Makefile.in
index 63dbe0ef76b..85c95d9edf6 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmcss/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmcss/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmcss
+subdir = docs/tdebase/kcontrol/kcmcss
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmcss/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmcss/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmcss/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmcss/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmcss/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmcss/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmkonsole/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmkonsole/Makefile.in
index 8ddcd66de41..e6af6587a42 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmkonsole/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmkonsole/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmkonsole
+subdir = docs/tdebase/kcontrol/kcmkonsole
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmkonsole/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmkonsole/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmkonsole/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmkonsole/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmkonsole/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmkonsole/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmlaunch/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmlaunch/Makefile.in
index 9e083d39d57..0fec453d1d5 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmlaunch/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmlaunch/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmlaunch
+subdir = docs/tdebase/kcontrol/kcmlaunch
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmlaunch/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmlaunch/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmlaunch/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmlaunch/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmlaunch/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmlaunch/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmnotify/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmnotify/Makefile.in
index aaa16644c34..7f213d3aac9 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmnotify/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmnotify/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmnotify
+subdir = docs/tdebase/kcontrol/kcmnotify
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmnotify/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmnotify/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmnotify/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmnotify/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmnotify/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmnotify/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmsmserver/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmsmserver/Makefile.in
index 3d567264ced..4c7d662066f 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmsmserver/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmsmserver/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmsmserver
+subdir = docs/tdebase/kcontrol/kcmsmserver
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmsmserver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmsmserver/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmsmserver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmsmserver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmsmserver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmsmserver/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kcmtaskbar/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kcmtaskbar/Makefile.in
index d17a3fc71e3..511fdd1058d 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kcmtaskbar/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kcmtaskbar/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kcmtaskbar
+subdir = docs/tdebase/kcontrol/kcmtaskbar
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmtaskbar/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmtaskbar/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kcmtaskbar/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kcmtaskbar/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kcmtaskbar/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kcmtaskbar/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/keyboard/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/keyboard/Makefile.in
index 36c80d66f6d..ef0aac74e9d 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/keyboard/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/keyboard/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/keyboard
+subdir = docs/tdebase/kcontrol/keyboard
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/keyboard/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/keyboard/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keyboard/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/keyboard/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keyboard/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/keyboard/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/keys/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/keys/Makefile.in
index 78ec41e7cbe..c6be2932dc1 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/keys/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/keys/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/keys
+subdir = docs/tdebase/kcontrol/keys
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/keys/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/keys/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/keys/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/keys/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/keys/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/keys/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/khtml/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/khtml/Makefile.in
index fc3d687a541..8a997384286 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/khtml/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/khtml/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/khtml
+subdir = docs/tdebase/kcontrol/khtml
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/khtml/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/khtml/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/khtml/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/khtml/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/khtml/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/khtml/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/Makefile.in
index 48eda19e2a3..6e1dde09f9a 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kthememgr
+subdir = docs/tdebase/kcontrol/kthememgr
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kthememgr/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kthememgr/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kthememgr/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kthememgr/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/kthememgr/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/kthememgr/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/index.docbook
index a64b80cdc18..2f9500b1ab9 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kthememgr/index.docbook
@@ -127,7 +127,7 @@
 >Eclipse</quote
 >テーマは全設定可能項目の設定を含んでいて、デフォルトでは、それら全ての項目の設定をテーマの設定に変更するようになっています。<quote
 >MGBreizh</quote
->テーマは、アイコン以外の全項目の設定を含んでいます。kdeartworkパッケージに含まれる<quote
+>テーマは、アイコン以外の全項目の設定を含んでいます。tdeartworkパッケージに含まれる<quote
 >Technical</quote
 >テーマは、アイコンに関する設定<emphasis
 >のみ</emphasis
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.am b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.am
index 60213c229cd..34e558eb973 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.am
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.am
@@ -1,4 +1,4 @@
 KDE_LANG = ja
 SUBDIRS = $(AUTODIRS)
-KDE_DOCS = kcontrol/kwindecoration
+KDE_DOCS = kcontrol/twindecoration
 KDE_MANS = AUTO
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.in
index 46c7ff5cd09..e44983308ea 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/kwindecoration
+subdir = docs/tdebase/kcontrol/twindecoration
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -188,7 +188,7 @@ KDE_LANG = ja
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
 SUBDIRS =.
-KDE_DOCS = kcontrol/kwindecoration
+KDE_DOCS = kcontrol/twindecoration
 KDE_MANS = AUTO
 #>- all: all-recursive
 #>+ 1
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kwindecoration/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/twindecoration/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,19 +534,19 @@ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
 docs-am: index.cache.bz2
 
 install-docs: docs-am install-nls
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration
 	@if test -f index.cache.bz2; then \
-	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/; \
-	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/; \
+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/; \
+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/; \
 	elif test -f  $(srcdir)/index.cache.bz2; then \
-	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/; \
-	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/; \
+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/; \
+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/; \
 	fi
-	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/common
+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/common
+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/common
 
 uninstall-docs:
-	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration
+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration
 
 clean-docs:
 	-rm -f index.cache.bz2
@@ -554,15 +554,15 @@ clean-docs:
 
 #>+ 13
 install-nls:
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration
 	@for base in index.docbook ; do \
-	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/$$base ;\
-	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/$$base ;\
+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/$$base ;\
+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/$$base ;\
 	done
 
 uninstall-nls:
 	for base in index.docbook ; do \
-	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/kwindecoration/$$base ;\
+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/twindecoration/$$base ;\
 	done
 
 
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/kwindecoration/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/kwindecoration/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/twindecoration/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/twindecoration/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/index.docbook
index 398598f95dd..ce7461acb49 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/kwindecoration/index.docbook
@@ -39,7 +39,7 @@
 <keyword
 >KControl</keyword>
 <keyword
->kwin</keyword>
+>twin</keyword>
 <keyword
 >ウィンドウ</keyword>
 <keyword
@@ -107,7 +107,7 @@
 
 </sect2>
 
-<sect2 id="kwintheme-author">
+<sect2 id="twintheme-author">
 <title
 >このセクションの作者</title>
 
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/mouse/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/mouse/Makefile.in
index c0fc04aa30c..58aa364ee25 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/mouse/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/mouse/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/mouse
+subdir = docs/tdebase/kcontrol/mouse
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/mouse/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/mouse/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/mouse/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/mouse/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/mouse/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/mouse/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/netpref/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/netpref/Makefile.in
index a8c9f799c2b..0410a6bdc95 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/netpref/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/netpref/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/netpref
+subdir = docs/tdebase/kcontrol/netpref
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/netpref/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/netpref/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/netpref/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/netpref/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/netpref/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/netpref/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/netpref/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/netpref/index.docbook
index ef6e4bb10f6..c221ae28602 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/netpref/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/netpref/index.docbook
@@ -44,7 +44,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdebase</keyword>
+>tdebase</keyword>
 <keyword
 >kcontrol</keyword>
 <keyword
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/passwords/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/passwords/Makefile.in
index 8624a649820..2614aaadeb0 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/passwords/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/passwords/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/passwords
+subdir = docs/tdebase/kcontrol/passwords
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/passwords/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/passwords/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/passwords/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/passwords/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/passwords/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/passwords/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/passwords/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/passwords/index.docbook
index b4b9e572c4d..9c1f590b307 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/passwords/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/passwords/index.docbook
@@ -59,7 +59,7 @@
 >はじめに</title>
 
 <para
->この&kcontrol;モジュールでは、&kdesu;プログラムでのパスワードの取扱方法に関する設定ができます。&kdesu;は何か権限が必要な操作(システムクロックの日付/時刻の設定の変更や、新規ユーザの追加等)を行おうとすると、パスワードの入力を要求します。</para>
+>この&kcontrol;モジュールでは、&tdesu;プログラムでのパスワードの取扱方法に関する設定ができます。&tdesu;は何か権限が必要な操作(システムクロックの日付/時刻の設定の変更や、新規ユーザの追加等)を行おうとすると、パスワードの入力を要求します。</para>
 
 <para
 >上記した権限が必要な操作は、<systemitem class="username"
@@ -92,7 +92,7 @@
 <para
 ><guilabel
 >パスワードを保存</guilabel
->を選択しておくと、一度パスワードを入力した後では、ここで指定した時間の間は、&kdesu;はパスワードの入力を求めなくなります。ただしこれによりあなたのワークステーションは、その分安全ではなくなります。</para>
+>を選択しておくと、一度パスワードを入力した後では、ここで指定した時間の間は、&tdesu;はパスワードの入力を求めなくなります。ただしこれによりあなたのワークステーションは、その分安全ではなくなります。</para>
 
 <important
 ><para
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/proxy/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/proxy/Makefile.in
index fb4a278d8d6..5fec5c652aa 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/proxy/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/proxy/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/proxy
+subdir = docs/tdebase/kcontrol/proxy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/proxy/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/proxy/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/proxy/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/proxy/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/proxy/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/proxy/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/screensaver/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/screensaver/Makefile.in
index 10593caf413..a3e3fb43d68 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/screensaver/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/screensaver/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/screensaver
+subdir = docs/tdebase/kcontrol/screensaver
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/screensaver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/screensaver/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/screensaver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/screensaver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/screensaver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/screensaver/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/smb/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/smb/Makefile.in
index 2f4ab8b8f95..e2a5a05d1f7 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/smb/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/smb/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/smb
+subdir = docs/tdebase/kcontrol/smb
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/smb/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/smb/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/smb/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/smb/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/smb/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/smb/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/smb/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/smb/index.docbook
index 42e244b56d2..dfd345e8801 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/smb/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/smb/index.docbook
@@ -86,7 +86,7 @@ documentation -->
 <!-- this smb-ioslave doesn't support showing a list
 of hosts (like e.g. smb:/), for this you need the lan or rlan-ioslave,
 very cool thing (TM) btw. If you want to write some documentation for
-this one too, have a look at kdenetwork/lanbrowsing/lisa/README and
+this one too, have a look at tdenetwork/lanbrowsing/lisa/README and
 contact me if you have questions. -->
 
 <note
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/spellchecking/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/spellchecking/Makefile.in
index 66f86e7196f..5cd347d63be 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/spellchecking/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/spellchecking/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/spellchecking
+subdir = docs/tdebase/kcontrol/spellchecking
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/spellchecking/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/spellchecking/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/spellchecking/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/spellchecking/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/spellchecking/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/spellchecking/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/useragent/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/useragent/Makefile.in
index 97edc85d9bb..a4c6700c500 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/useragent/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/useragent/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/useragent
+subdir = docs/tdebase/kcontrol/useragent
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/useragent/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/useragent/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/useragent/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/useragent/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/useragent/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/useragent/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/Makefile.in b/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/Makefile.in
index d97251549bc..af99180628c 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kcontrol/windowmanagement
+subdir = docs/tdebase/kcontrol/windowmanagement
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/windowmanagement/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/windowmanagement/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kcontrol/windowmanagement/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kcontrol/windowmanagement/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kcontrol/windowmanagement/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kcontrol/windowmanagement/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/index.docbook b/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/index.docbook
index bd3970a743a..79e0a7e1439 100644
--- a/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/kcontrol/windowmanagement/index.docbook
@@ -77,7 +77,7 @@
 
 <note
 > <para
-> このモジュールの設定は、&kde;固有のウィンドウマネージャである&kwin;を使っていない場合効果を持ちません。他のウィンドウマネージャを使いたい場合には、そのウィンドウマネージャのドキュメントでウィンドウの挙動のカスタマイズ方法を調べて下さい。 </para
+> このモジュールの設定は、&kde;固有のウィンドウマネージャである&twin;を使っていない場合効果を持ちません。他のウィンドウマネージャを使いたい場合には、そのウィンドウマネージャのドキュメントでウィンドウの挙動のカスタマイズ方法を調べて下さい。 </para
 > </note>
 
 <sect2 id="action-focus">
diff --git a/tde-i18n-ja/docs/kdebase/khelpcenter/Makefile.in b/tde-i18n-ja/docs/kdebase/khelpcenter/Makefile.in
index 721d1afa70f..b57c4fde596 100644
--- a/tde-i18n-ja/docs/kdebase/khelpcenter/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/khelpcenter/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/khelpcenter
+subdir = docs/tdebase/khelpcenter
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/khelpcenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/khelpcenter/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/khelpcenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/khelpcenter/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/khelpcenter/contact.docbook b/tde-i18n-ja/docs/kdebase/khelpcenter/contact.docbook
index 2ad4e2e22f2..a45cf91ba74 100644
--- a/tde-i18n-ja/docs/kdebase/khelpcenter/contact.docbook
+++ b/tde-i18n-ja/docs/kdebase/khelpcenter/contact.docbook
@@ -57,7 +57,7 @@
 </varlistentry>
 
 <varlistentry>
-<term><email>[email protected]</email> - kde-18n-doc</term>
+<term><email>[email protected]</email> - kde-18n-doc</term>
 <listitem><para>国際化とドキュメントの発行</para></listitem>
 </varlistentry>
 
diff --git a/tde-i18n-ja/docs/kdebase/khelpcenter/faq/Makefile.in b/tde-i18n-ja/docs/kdebase/khelpcenter/faq/Makefile.in
index e630f49d3d3..6f2c5a7ecb4 100644
--- a/tde-i18n-ja/docs/kdebase/khelpcenter/faq/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/khelpcenter/faq/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/khelpcenter/faq
+subdir = docs/tdebase/khelpcenter/faq
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/khelpcenter/faq/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/khelpcenter/faq/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -560,10 +560,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/khelpcenter/faq/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/khelpcenter/faq/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/khelpcenter/faq/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/khelpcenter/faq/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/khelpcenter/help.docbook b/tde-i18n-ja/docs/kdebase/khelpcenter/help.docbook
index b974d343769..1804a287e99 100644
--- a/tde-i18n-ja/docs/kdebase/khelpcenter/help.docbook
+++ b/tde-i18n-ja/docs/kdebase/khelpcenter/help.docbook
@@ -39,9 +39,9 @@
 >インストール</title>
 
 <para
-> &khelpcenter; は&kde;の基本インストールの一部に含まれていますので、全ての&kde;環境にインストールされています。これはkdebaseパッケージ内にありますので、<ulink url="ftp://ftp.kde.org/"
+> &khelpcenter; は&kde;の基本インストールの一部に含まれていますので、全ての&kde;環境にインストールされています。これはtdebaseパッケージ内にありますので、<ulink url="ftp://ftp.kde.org/"
 >KDE &FTP; site</ulink
->から入手できます。また、あなたのlinuxディストリビューションにもkdebaseパッケージが含まれているでしょう。 </para>
+>から入手できます。また、あなたのlinuxディストリビューションにもtdebaseパッケージが含まれているでしょう。 </para>
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-ja/docs/kdebase/khelpcenter/index.docbook b/tde-i18n-ja/docs/kdebase/khelpcenter/index.docbook
index c656ee7da42..a3e1f217b28 100644
--- a/tde-i18n-ja/docs/kdebase/khelpcenter/index.docbook
+++ b/tde-i18n-ja/docs/kdebase/khelpcenter/index.docbook
@@ -72,7 +72,7 @@ a way round it. (FF) -->
 <keyword
 >KDE</keyword>
 <keyword
->kdebase</keyword>
+>tdebase</keyword>
 <keyword
 >khelpcenter</keyword>
 <keyword
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/Makefile.in
index 06ce0f1140f..043702379b8 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter
+subdir = docs/tdebase/kinfocenter
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/dma/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/dma/Makefile.in
index 5ca42944198..df8f4d7bbc8 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/dma/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/dma/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/dma
+subdir = docs/tdebase/kinfocenter/dma
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/dma/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/dma/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/dma/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/dma/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/dma/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/dma/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/memory/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/memory/Makefile.in
index 2fffad4f1e1..7c4b6d11247 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/memory/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/memory/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/memory
+subdir = docs/tdebase/kinfocenter/memory
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/memory/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/memory/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/memory/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/memory/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/memory/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/memory/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/partitions/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/partitions/Makefile.in
index 9a6519c1afd..fd22a9ae92d 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/partitions/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/partitions/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/partitions
+subdir = docs/tdebase/kinfocenter/partitions
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/partitions/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/partitions/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/partitions/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/partitions/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/partitions/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/partitions/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/pci/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/pci/Makefile.in
index 6bd6d86d3f6..445a54c7ad2 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/pci/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/pci/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/pci
+subdir = docs/tdebase/kinfocenter/pci
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/pci/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/pci/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pci/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/pci/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pci/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/pci/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/pcmcia/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/pcmcia/Makefile.in
index b39532db700..3aac49d945f 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/pcmcia/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/pcmcia/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/pcmcia
+subdir = docs/tdebase/kinfocenter/pcmcia
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/pcmcia/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/pcmcia/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/pcmcia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/pcmcia/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/pcmcia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/pcmcia/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/processor/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/processor/Makefile.in
index 81649f007dc..3abeb59215a 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/processor/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/processor/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/processor
+subdir = docs/tdebase/kinfocenter/processor
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/processor/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/processor/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/processor/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/processor/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/processor/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/processor/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/protocols/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/protocols/Makefile.in
index f5aad90d0a6..154ea6f548c 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/protocols/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/protocols/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/protocols
+subdir = docs/tdebase/kinfocenter/protocols
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/protocols/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/protocols/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/protocols/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/protocols/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/protocols/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/protocols/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/samba/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/samba/Makefile.in
index b5dd648e08b..cb1dbfb7fec 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/samba/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/samba/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/samba
+subdir = docs/tdebase/kinfocenter/samba
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/samba/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/samba/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/samba/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/samba/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/samba/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/samba/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/scsi/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/scsi/Makefile.in
index 11662efdfe5..25499224b5e 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/scsi/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/scsi/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/scsi
+subdir = docs/tdebase/kinfocenter/scsi
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/scsi/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/scsi/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/scsi/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/scsi/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/scsi/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/scsi/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/sound/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/sound/Makefile.in
index 4db712ebf14..c4e85c9b7c2 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/sound/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/sound/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/sound
+subdir = docs/tdebase/kinfocenter/sound
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/sound/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/sound/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/sound/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/sound/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/sound/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/sound/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/usb/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/usb/Makefile.in
index 106e1369d66..c33cc85c7a1 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/usb/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/usb/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/usb
+subdir = docs/tdebase/kinfocenter/usb
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/usb/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/usb/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/usb/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/usb/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/usb/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/usb/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdebase/kinfocenter/xserver/Makefile.in b/tde-i18n-ja/docs/kdebase/kinfocenter/xserver/Makefile.in
index 7d19ddd57f5..d21a87468cf 100644
--- a/tde-i18n-ja/docs/kdebase/kinfocenter/xserver/Makefile.in
+++ b/tde-i18n-ja/docs/kdebase/kinfocenter/xserver/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kinfocenter/xserver
+subdir = docs/tdebase/kinfocenter/xserver
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/xserver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/xserver/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kinfocenter/xserver/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kinfocenter/xserver/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/kinfocenter/xserver/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/kinfocenter/xserver/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdegames/Makefile.in b/tde-i18n-ja/docs/kdegames/Makefile.in
index ee643472ae9..6167ed8c1d3 100644
--- a/tde-i18n-ja/docs/kdegames/Makefile.in
+++ b/tde-i18n-ja/docs/kdegames/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdegames
+subdir = docs/tdegames
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdegames/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdegames/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdegames/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdegames/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdegames/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdegames/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdegames/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdegames/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdegames/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdegames/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdegames/kshisen/Makefile.in b/tde-i18n-ja/docs/kdegames/kshisen/Makefile.in
index 52b21eec943..7aaf0b04d0f 100644
--- a/tde-i18n-ja/docs/kdegames/kshisen/Makefile.in
+++ b/tde-i18n-ja/docs/kdegames/kshisen/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdegames/kshisen
+subdir = docs/tdegames/kshisen
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdegames/kshisen/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdegames/kshisen/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdegames/kshisen/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdegames/kshisen/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdegames/kshisen/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdegames/kshisen/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdegames/kshisen/index.docbook b/tde-i18n-ja/docs/kdegames/kshisen/index.docbook
index ff44935258f..3256853bf20 100644
--- a/tde-i18n-ja/docs/kdegames/kshisen/index.docbook
+++ b/tde-i18n-ja/docs/kdegames/kshisen/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kappname "&kshisen;">
-  <!ENTITY package "kdegames">
+  <!ENTITY package "tdegames">
   <!ENTITY % Japanese "INCLUDE"
 > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -67,7 +67,7 @@
       <keyword
 >KDE</keyword>
       <keyword
->kdegames</keyword>
+>tdegames</keyword>
       <keyword
 >kshisen</keyword>
       <keyword
diff --git a/tde-i18n-ja/docs/kdemultimedia/Makefile.in b/tde-i18n-ja/docs/kdemultimedia/Makefile.in
index 461b8519483..3d9a08e7e1a 100644
--- a/tde-i18n-ja/docs/kdemultimedia/Makefile.in
+++ b/tde-i18n-ja/docs/kdemultimedia/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdemultimedia
+subdir = docs/tdemultimedia
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdemultimedia/kcontrol/Makefile.in b/tde-i18n-ja/docs/kdemultimedia/kcontrol/Makefile.in
index 5c0e564e0e8..1d2c97f038c 100644
--- a/tde-i18n-ja/docs/kdemultimedia/kcontrol/Makefile.in
+++ b/tde-i18n-ja/docs/kdemultimedia/kcontrol/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdemultimedia/kcontrol
+subdir = docs/tdemultimedia/kcontrol
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/kcontrol/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/kcontrol/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in b/tde-i18n-ja/docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in
index bc59ab3e7df..e843236917c 100644
--- a/tde-i18n-ja/docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in
+++ b/tde-i18n-ja/docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdemultimedia/kcontrol/kmixcfg
+subdir = docs/tdemultimedia/kcontrol/kmixcfg
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/kcontrol/kmixcfg/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdemultimedia/kcontrol/kmixcfg/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdemultimedia/kcontrol/kmixcfg/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdemultimedia/kcontrol/kmixcfg/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdemultimedia/kcontrol/kmixcfg/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdepim/Makefile.in b/tde-i18n-ja/docs/kdepim/Makefile.in
index 061ddd61307..1606f9a9ad3 100644
--- a/tde-i18n-ja/docs/kdepim/Makefile.in
+++ b/tde-i18n-ja/docs/kdepim/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdepim
+subdir = docs/tdepim
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdepim/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdepim/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdepim/kcontrol/Makefile.in b/tde-i18n-ja/docs/kdepim/kcontrol/Makefile.in
index 0a39831fbd6..47774c419e6 100644
--- a/tde-i18n-ja/docs/kdepim/kcontrol/Makefile.in
+++ b/tde-i18n-ja/docs/kdepim/kcontrol/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdepim/kcontrol
+subdir = docs/tdepim/kcontrol
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/kcontrol/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/kcontrol/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/Makefile.in b/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/Makefile.in
index 7c930745ed5..747179d1712 100644
--- a/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/Makefile.in
+++ b/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdepim/kcontrol/kalarmd
+subdir = docs/tdepim/kcontrol/kalarmd
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/kcontrol/kalarmd/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/kcontrol/kalarmd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdepim/kcontrol/kalarmd/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdepim/kcontrol/kalarmd/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdepim/kcontrol/kalarmd/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdepim/kcontrol/kalarmd/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/index.docbook b/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/index.docbook
index 8cd730de65e..2eae262c6e1 100644
--- a/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/index.docbook
+++ b/tde-i18n-ja/docs/kdepim/kcontrol/kalarmd/index.docbook
@@ -59,7 +59,7 @@
 >アラームデーモン</title>
 
 <para
->このモジュールは&kalarmd;(kdepimパッケージのアラームデーモン)を設定します。kdepimパッケージをインストールしていなければ使えません。</para>
+>このモジュールは&kalarmd;(tdepimパッケージのアラームデーモン)を設定します。tdepimパッケージをインストールしていなければ使えません。</para>
 
 <para
 >このモジュールには２つのオプションしかありません。</para>
diff --git a/tde-i18n-ja/docs/kdeutils/Makefile.in b/tde-i18n-ja/docs/kdeutils/Makefile.in
index 790449b1f4c..da9ff196869 100644
--- a/tde-i18n-ja/docs/kdeutils/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils
+subdir = docs/tdeutils
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kcontrol/Makefile.in b/tde-i18n-ja/docs/kdeutils/kcontrol/Makefile.in
index 8542b39f0e2..77166114fcd 100644
--- a/tde-i18n-ja/docs/kdeutils/kcontrol/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kcontrol/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kcontrol
+subdir = docs/tdeutils/kcontrol
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in b/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in
index 7c645e58676..29bfdd543d9 100644
--- a/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kcontrol/kcmlowbatcrit
+subdir = docs/tdeutils/kcontrol/kcmlowbatcrit
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/kcmlowbatcrit/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/kcmlowbatcrit/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in b/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in
index de88c8c3858..a10cafb60c0 100644
--- a/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kcontrol/kcmlowbatwarn
+subdir = docs/tdeutils/kcontrol/kcmlowbatwarn
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/kcmlowbatwarn/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/kcmlowbatwarn/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kcontrol/laptop/Makefile.in b/tde-i18n-ja/docs/kdeutils/kcontrol/laptop/Makefile.in
index d6536f073e2..72a77b81f2f 100644
--- a/tde-i18n-ja/docs/kdeutils/kcontrol/laptop/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kcontrol/laptop/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kcontrol/laptop
+subdir = docs/tdeutils/kcontrol/laptop
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/laptop/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/laptop/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/laptop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/laptop/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/laptop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/laptop/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kcontrol/powerctrl/Makefile.in b/tde-i18n-ja/docs/kdeutils/kcontrol/powerctrl/Makefile.in
index 738ad008e74..53b4aa1c5c1 100644
--- a/tde-i18n-ja/docs/kdeutils/kcontrol/powerctrl/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kcontrol/powerctrl/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kcontrol/powerctrl
+subdir = docs/tdeutils/kcontrol/powerctrl
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/powerctrl/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/powerctrl/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kcontrol/powerctrl/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kcontrol/powerctrl/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kcontrol/powerctrl/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kcontrol/powerctrl/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kgpg/Makefile.in b/tde-i18n-ja/docs/kdeutils/kgpg/Makefile.in
index 34992ceba85..e0a4be013e3 100644
--- a/tde-i18n-ja/docs/kdeutils/kgpg/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kgpg/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kgpg
+subdir = docs/tdeutils/kgpg
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kgpg/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kgpg/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kgpg/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kgpg/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kgpg/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kgpg/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kgpg/index.docbook b/tde-i18n-ja/docs/kdeutils/kgpg/index.docbook
index 650eab44945..f18da9bf0b6 100644
--- a/tde-i18n-ja/docs/kdeutils/kgpg/index.docbook
+++ b/tde-i18n-ja/docs/kdeutils/kgpg/index.docbook
@@ -4,7 +4,7 @@
   <!ENTITY kgpg "<application
 >Kgpg</application
 >">
-  <!ENTITY package "kdeutils">
+  <!ENTITY package "tdeutils">
   <!ENTITY kappname "&kgpg;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Japanese "INCLUDE">
diff --git a/tde-i18n-ja/docs/kdeutils/kinfocenter/Makefile.in b/tde-i18n-ja/docs/kdeutils/kinfocenter/Makefile.in
index 284379af494..1e61520ffbf 100644
--- a/tde-i18n-ja/docs/kdeutils/kinfocenter/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kinfocenter/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kinfocenter
+subdir = docs/tdeutils/kinfocenter
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kinfocenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kinfocenter/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,10 +534,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kinfocenter/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kinfocenter/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/docs/kdeutils/kinfocenter/blockdevices/Makefile.in b/tde-i18n-ja/docs/kdeutils/kinfocenter/blockdevices/Makefile.in
index a2ee86f8289..dcc5b19a863 100644
--- a/tde-i18n-ja/docs/kdeutils/kinfocenter/blockdevices/Makefile.in
+++ b/tde-i18n-ja/docs/kdeutils/kinfocenter/blockdevices/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdeutils/kinfocenter/blockdevices
+subdir = docs/tdeutils/kinfocenter/blockdevices
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kinfocenter/blockdevices/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kinfocenter/blockdevices/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdeutils/kinfocenter/blockdevices/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdeutils/kinfocenter/blockdevices/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdeutils/kinfocenter/blockdevices/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdeutils/kinfocenter/blockdevices/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/Makefile.in b/tde-i18n-ja/messages/Makefile.in
index 0f28b7bb3e1..3291801bc2c 100644
--- a/tde-i18n-ja/messages/Makefile.in
+++ b/tde-i18n-ja/messages/Makefile.in
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -187,7 +187,7 @@ xdg_menudir = @xdg_menudir@
 KDE_LANG = ja
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
-SUBDIRS =. kdegraphics kdeutils kdenetwork kdeadmin kdepim kdetoys kdeedu kdevelop kdeartwork kdesdk kdeaddons kdegames kdeaccessibility kdemultimedia kdebase kdelibs kdewebdev
+SUBDIRS =. tdegraphics tdeutils tdenetwork tdeadmin tdepim tdetoys tdeedu tdevelop tdeartwork tdesdk tdeaddons tdegames tdeaccessibility tdemultimedia tdebase tdelibs tdewebdev
 POFILES = AUTO
 #>- all: all-recursive
 #>+ 1
diff --git a/tde-i18n-ja/messages/kdeaccessibility/Makefile.in b/tde-i18n-ja/messages/kdeaccessibility/Makefile.in
index ed874dcc8d4..3b41ab60cd4 100644
--- a/tde-i18n-ja/messages/kdeaccessibility/Makefile.in
+++ b/tde-i18n-ja/messages/kdeaccessibility/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeaccessibility
+subdir = messages/tdeaccessibility
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeaccessibility/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeaccessibility/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -606,10 +606,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeaccessibility/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeaccessibility/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeaccessibility/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeaccessibility/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeaddons/Makefile.in b/tde-i18n-ja/messages/kdeaddons/Makefile.in
index 324a9998592..db6872556a2 100644
--- a/tde-i18n-ja/messages/kdeaddons/Makefile.in
+++ b/tde-i18n-ja/messages/kdeaddons/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeaddons
+subdir = messages/tdeaddons
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeaddons/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeaddons/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -858,10 +858,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeaddons/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeaddons/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeaddons/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeaddons/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeaddons/konqsidebar_news.po b/tde-i18n-ja/messages/kdeaddons/konqsidebar_news.po
index 4f4c8bc9e85..db18481022c 100644
--- a/tde-i18n-ja/messages/kdeaddons/konqsidebar_news.po
+++ b/tde-i18n-ja/messages/kdeaddons/konqsidebar_news.po
@@ -77,10 +77,10 @@ msgstr "RSS ソースのリスト"
 msgid ""
 "<qt>Cannot connect to RSS service. Please make sure the <strong>"
 "rssservice</strong> program is available (usually distributed as part of "
-"kdenetwork).</qt>"
+"tdenetwork).</qt>"
 msgstr ""
 "<qt>RSS サービスに接続できません。<strong>rssservice</strong> プログラムが利用可能かどうか確認してください。(通常 "
-"kdenetwork の一部として配布されています)</qt>"
+"tdenetwork の一部として配布されています)</qt>"
 
 #: sidebar_news.cpp:80
 msgid "Sidebar Newsticker"
diff --git a/tde-i18n-ja/messages/kdeaddons/lyrics.po b/tde-i18n-ja/messages/kdeaddons/lyrics.po
index 7d7eba64c92..8acf706e0b8 100644
--- a/tde-i18n-ja/messages/kdeaddons/lyrics.po
+++ b/tde-i18n-ja/messages/kdeaddons/lyrics.po
@@ -191,7 +191,7 @@ msgid ""
 "not be present or be incorrect. In that case, the Lyrics plugin will not be "
 "able to find the lyrics until these properties are fixed (you can fix them "
 "using the tag editor).\n"
-"Hint: The lucky tag plugin, present in the kdeaddons module, can try to guess "
+"Hint: The lucky tag plugin, present in the tdeaddons module, can try to guess "
 "properties such as title and author from the filename of a song. Enabling it "
 "may increase the probability of finding lyrics."
 msgstr ""
diff --git a/tde-i18n-ja/messages/kdeadmin/Makefile.in b/tde-i18n-ja/messages/kdeadmin/Makefile.in
index 59006ff8ec6..73a3ac91d23 100644
--- a/tde-i18n-ja/messages/kdeadmin/Makefile.in
+++ b/tde-i18n-ja/messages/kdeadmin/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeadmin
+subdir = messages/tdeadmin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeadmin/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeadmin/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -618,10 +618,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeadmin/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeadmin/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeadmin/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeadmin/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeartwork/Makefile.in b/tde-i18n-ja/messages/kdeartwork/Makefile.in
index c3491576e29..2c5aee52f29 100644
--- a/tde-i18n-ja/messages/kdeartwork/Makefile.in
+++ b/tde-i18n-ja/messages/kdeartwork/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeartwork
+subdir = messages/tdeartwork
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = klock.po kwin_art_clients.po kstyle_phase_config.po kxsconfig.po kpartsaver.po
-GMOFILES = klock.gmo kwin_art_clients.gmo kstyle_phase_config.gmo kxsconfig.gmo kpartsaver.gmo
+POFILES = klock.po twin_art_clients.po kstyle_phase_config.po kxsconfig.po kpartsaver.po
+GMOFILES = klock.gmo twin_art_clients.gmo kstyle_phase_config.gmo kxsconfig.gmo kpartsaver.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeartwork/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeartwork/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,15 +531,15 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=klock.po kxsconfig.po kpartsaver.po kwin_art_clients.po Makefile.in kstyle_phase_config.po Makefile.am 
+KDE_DIST=klock.po kxsconfig.po kpartsaver.po twin_art_clients.po Makefile.in kstyle_phase_config.po Makefile.am 
 
 #>+ 16
 klock.gmo: klock.po
 	rm -f klock.gmo; $(GMSGFMT) -o klock.gmo $(srcdir)/klock.po
 	test ! -f klock.gmo || touch klock.gmo
-kwin_art_clients.gmo: kwin_art_clients.po
-	rm -f kwin_art_clients.gmo; $(GMSGFMT) -o kwin_art_clients.gmo $(srcdir)/kwin_art_clients.po
-	test ! -f kwin_art_clients.gmo || touch kwin_art_clients.gmo
+twin_art_clients.gmo: twin_art_clients.po
+	rm -f twin_art_clients.gmo; $(GMSGFMT) -o twin_art_clients.gmo $(srcdir)/twin_art_clients.po
+	test ! -f twin_art_clients.gmo || touch twin_art_clients.gmo
 kstyle_phase_config.gmo: kstyle_phase_config.po
 	rm -f kstyle_phase_config.gmo; $(GMSGFMT) -o kstyle_phase_config.gmo $(srcdir)/kstyle_phase_config.po
 	test ! -f kstyle_phase_config.gmo || touch kstyle_phase_config.gmo
@@ -552,12 +552,12 @@ kpartsaver.gmo: kpartsaver.po
 
 #>+ 3
 clean-nls:
-	-rm -f  klock.gmo kwin_art_clients.gmo kstyle_phase_config.gmo kxsconfig.gmo kpartsaver.gmo
+	-rm -f  klock.gmo twin_art_clients.gmo kstyle_phase_config.gmo kxsconfig.gmo kpartsaver.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in klock kwin_art_clients kstyle_phase_config kxsconfig kpartsaver ; do \
+	@for base in klock twin_art_clients kstyle_phase_config kxsconfig kpartsaver ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -568,7 +568,7 @@ install-nls:
 #>+ 7
 uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/klock.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_art_clients.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_art_clients.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_phase_config.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kxsconfig.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpartsaver.mo
@@ -598,10 +598,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeartwork/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeartwork/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeartwork/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeartwork/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeartwork/kwin_art_clients.po b/tde-i18n-ja/messages/kdeartwork/kwin_art_clients.po
index 846bec10aee..51ea4043a4e 100644
--- a/tde-i18n-ja/messages/kdeartwork/kwin_art_clients.po
+++ b/tde-i18n-ja/messages/kdeartwork/kwin_art_clients.po
@@ -1,22 +1,22 @@
-# translation of kwin_art_clients.po to Japanese
+# translation of twin_art_clients.po to Japanese
 # AWASHIRO Ikuya <[email protected]>, 2004.
 # AWASHIRO Ikuya <[email protected]>, 2004.#.
 # Fumiaki Okushi <[email protected]>, 2006.
-# #-#-#-#-#  kwin_cde.po (kwin_cde)  #-#-#-#-#
+# #-#-#-#-#  twin_cde.po (twin_cde)  #-#-#-#-#
 # Copyright (C) 2004, 2006 Free Software Foundation, Inc.
-# #-#-#-#-#  kwin_glow.po (kwin_glow)  #-#-#-#-#
+# #-#-#-#-#  twin_glow.po (twin_glow)  #-#-#-#-#
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# #-#-#-#-#  kwin_icewm.po (kwin_icewm)  #-#-#-#-#
-# #-#-#-#-#  kwin_kde1.po (kwin_kde1)  #-#-#-#-#
-# #-#-#-#-#  kwin_kstep.po (kwin_kstep)  #-#-#-#-#
-# #-#-#-#-#  kwin_openlook.po (kwin_openlook)  #-#-#-#-#
+# #-#-#-#-#  twin_icewm.po (twin_icewm)  #-#-#-#-#
+# #-#-#-#-#  twin_kde1.po (twin_kde1)  #-#-#-#-#
+# #-#-#-#-#  twin_kstep.po (twin_kstep)  #-#-#-#-#
+# #-#-#-#-#  twin_openlook.po (twin_openlook)  #-#-#-#-#
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# #-#-#-#-#  kwin_plastik.po (kwin_plastik)  #-#-#-#-#
-# #-#-#-#-#  kwin_riscos.po (kwin_riscos)  #-#-#-#-#
-# #-#-#-#-#  kwin_system.po (kwin_system)  #-#-#-#-#
+# #-#-#-#-#  twin_plastik.po (twin_plastik)  #-#-#-#-#
+# #-#-#-#-#  twin_riscos.po (twin_riscos)  #-#-#-#-#
+# #-#-#-#-#  twin_system.po (twin_system)  #-#-#-#-#
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_art_clients\n"
+"Project-Id-Version: twin_art_clients\n"
 "POT-Creation-Date: 2005-12-17 03:14+0100\n"
 "PO-Revision-Date: 2007-03-29 22:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdebase/Makefile.in b/tde-i18n-ja/messages/kdebase/Makefile.in
index f31998be3ad..cfe8d3b35b8 100644
--- a/tde-i18n-ja/messages/kdebase/Makefile.in
+++ b/tde-i18n-ja/messages/kdebase/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdebase
+subdir = messages/tdebase
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po
-GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmtwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po tdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po tdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po twin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmtwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_tdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po twin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po twin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po tdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po tdeprint_part.po kio_smtp.po
+GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
+KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po twin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po tdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmtwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po twin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in tdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_tdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po twin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmtwinrules.po libdmctl.po krdb.po kio_home.po tdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po tdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
 
 #>+ 469
 kio_sftp.gmo: kio_sftp.po
@@ -573,9 +573,9 @@ kcmlaunch.gmo: kcmlaunch.po
 kcminfo.gmo: kcminfo.po
 	rm -f kcminfo.gmo; $(GMSGFMT) -o kcminfo.gmo $(srcdir)/kcminfo.po
 	test ! -f kcminfo.gmo || touch kcminfo.gmo
-kcmkwinrules.gmo: kcmkwinrules.po
-	rm -f kcmkwinrules.gmo; $(GMSGFMT) -o kcmkwinrules.gmo $(srcdir)/kcmkwinrules.po
-	test ! -f kcmkwinrules.gmo || touch kcmkwinrules.gmo
+kcmtwinrules.gmo: kcmtwinrules.po
+	rm -f kcmtwinrules.gmo; $(GMSGFMT) -o kcmtwinrules.gmo $(srcdir)/kcmtwinrules.po
+	test ! -f kcmtwinrules.gmo || touch kcmtwinrules.gmo
 kasbarextension.gmo: kasbarextension.po
 	rm -f kasbarextension.gmo; $(GMSGFMT) -o kasbarextension.gmo $(srcdir)/kasbarextension.po
 	test ! -f kasbarextension.gmo || touch kasbarextension.gmo
@@ -636,9 +636,9 @@ kio_remote.gmo: kio_remote.po
 kio_home.gmo: kio_home.po
 	rm -f kio_home.gmo; $(GMSGFMT) -o kio_home.gmo $(srcdir)/kio_home.po
 	test ! -f kio_home.gmo || touch kio_home.gmo
-kdeprintfax.gmo: kdeprintfax.po
-	rm -f kdeprintfax.gmo; $(GMSGFMT) -o kdeprintfax.gmo $(srcdir)/kdeprintfax.po
-	test ! -f kdeprintfax.gmo || touch kdeprintfax.gmo
+tdeprintfax.gmo: tdeprintfax.po
+	rm -f tdeprintfax.gmo; $(GMSGFMT) -o tdeprintfax.gmo $(srcdir)/tdeprintfax.po
+	test ! -f tdeprintfax.gmo || touch tdeprintfax.gmo
 kcmicons.gmo: kcmicons.po
 	rm -f kcmicons.gmo; $(GMSGFMT) -o kcmicons.gmo $(srcdir)/kcmicons.po
 	test ! -f kcmicons.gmo || touch kcmicons.gmo
@@ -678,9 +678,9 @@ kaccess.gmo: kaccess.po
 kio_pop3.gmo: kio_pop3.po
 	rm -f kio_pop3.gmo; $(GMSGFMT) -o kio_pop3.gmo $(srcdir)/kio_pop3.po
 	test ! -f kio_pop3.gmo || touch kio_pop3.gmo
-kdesud.gmo: kdesud.po
-	rm -f kdesud.gmo; $(GMSGFMT) -o kdesud.gmo $(srcdir)/kdesud.po
-	test ! -f kdesud.gmo || touch kdesud.gmo
+tdesud.gmo: tdesud.po
+	rm -f tdesud.gmo; $(GMSGFMT) -o tdesud.gmo $(srcdir)/tdesud.po
+	test ! -f tdesud.gmo || touch tdesud.gmo
 kio_fish.gmo: kio_fish.po
 	rm -f kio_fish.gmo; $(GMSGFMT) -o kio_fish.gmo $(srcdir)/kio_fish.po
 	test ! -f kio_fish.gmo || touch kio_fish.gmo
@@ -771,9 +771,9 @@ kcmlayout.gmo: kcmlayout.po
 kpager.gmo: kpager.po
 	rm -f kpager.gmo; $(GMSGFMT) -o kpager.gmo $(srcdir)/kpager.po
 	test ! -f kpager.gmo || touch kpager.gmo
-kwin_clients.gmo: kwin_clients.po
-	rm -f kwin_clients.gmo; $(GMSGFMT) -o kwin_clients.gmo $(srcdir)/kwin_clients.po
-	test ! -f kwin_clients.gmo || touch kwin_clients.gmo
+twin_clients.gmo: twin_clients.po
+	rm -f twin_clients.gmo; $(GMSGFMT) -o twin_clients.gmo $(srcdir)/twin_clients.po
+	test ! -f twin_clients.gmo || touch twin_clients.gmo
 kdebugdialog.gmo: kdebugdialog.po
 	rm -f kdebugdialog.gmo; $(GMSGFMT) -o kdebugdialog.gmo $(srcdir)/kdebugdialog.po
 	test ! -f kdebugdialog.gmo || touch kdebugdialog.gmo
@@ -804,9 +804,9 @@ libkickermenu_remotemenu.gmo: libkickermenu_remotemenu.po
 lockout.gmo: lockout.po
 	rm -f lockout.gmo; $(GMSGFMT) -o lockout.gmo $(srcdir)/lockout.po
 	test ! -f lockout.gmo || touch lockout.gmo
-kcmkwindecoration.gmo: kcmkwindecoration.po
-	rm -f kcmkwindecoration.gmo; $(GMSGFMT) -o kcmkwindecoration.gmo $(srcdir)/kcmkwindecoration.po
-	test ! -f kcmkwindecoration.gmo || touch kcmkwindecoration.gmo
+kcmtwindecoration.gmo: kcmtwindecoration.po
+	rm -f kcmtwindecoration.gmo; $(GMSGFMT) -o kcmtwindecoration.gmo $(srcdir)/kcmtwindecoration.po
+	test ! -f kcmtwindecoration.gmo || touch kcmtwindecoration.gmo
 kxkb.gmo: kxkb.po
 	rm -f kxkb.gmo; $(GMSGFMT) -o kxkb.gmo $(srcdir)/kxkb.po
 	test ! -f kxkb.gmo || touch kxkb.gmo
@@ -831,9 +831,9 @@ kcmnic.gmo: kcmnic.po
 privacy.gmo: privacy.po
 	rm -f privacy.gmo; $(GMSGFMT) -o privacy.gmo $(srcdir)/privacy.po
 	test ! -f privacy.gmo || touch privacy.gmo
-libkickermenu_kdeprint.gmo: libkickermenu_kdeprint.po
-	rm -f libkickermenu_kdeprint.gmo; $(GMSGFMT) -o libkickermenu_kdeprint.gmo $(srcdir)/libkickermenu_kdeprint.po
-	test ! -f libkickermenu_kdeprint.gmo || touch libkickermenu_kdeprint.gmo
+libkickermenu_tdeprint.gmo: libkickermenu_tdeprint.po
+	rm -f libkickermenu_tdeprint.gmo; $(GMSGFMT) -o libkickermenu_tdeprint.gmo $(srcdir)/libkickermenu_tdeprint.po
+	test ! -f libkickermenu_tdeprint.gmo || touch libkickermenu_tdeprint.gmo
 kscreensaver.gmo: kscreensaver.po
 	rm -f kscreensaver.gmo; $(GMSGFMT) -o kscreensaver.gmo $(srcdir)/kscreensaver.po
 	test ! -f kscreensaver.gmo || touch kscreensaver.gmo
@@ -870,9 +870,9 @@ ksystraycmd.gmo: ksystraycmd.po
 kcmsmartcard.gmo: kcmsmartcard.po
 	rm -f kcmsmartcard.gmo; $(GMSGFMT) -o kcmsmartcard.gmo $(srcdir)/kcmsmartcard.po
 	test ! -f kcmsmartcard.gmo || touch kcmsmartcard.gmo
-kwin.gmo: kwin.po
-	rm -f kwin.gmo; $(GMSGFMT) -o kwin.gmo $(srcdir)/kwin.po
-	test ! -f kwin.gmo || touch kwin.gmo
+twin.gmo: twin.po
+	rm -f twin.gmo; $(GMSGFMT) -o twin.gmo $(srcdir)/twin.po
+	test ! -f twin.gmo || touch twin.gmo
 libkicker.gmo: libkicker.po
 	rm -f libkicker.gmo; $(GMSGFMT) -o libkicker.gmo $(srcdir)/libkicker.po
 	test ! -f libkicker.gmo || touch libkicker.gmo
@@ -888,9 +888,9 @@ kgreet_winbind.gmo: kgreet_winbind.po
 drkonqi.gmo: drkonqi.po
 	rm -f drkonqi.gmo; $(GMSGFMT) -o drkonqi.gmo $(srcdir)/drkonqi.po
 	test ! -f drkonqi.gmo || touch drkonqi.gmo
-kwin_lib.gmo: kwin_lib.po
-	rm -f kwin_lib.gmo; $(GMSGFMT) -o kwin_lib.gmo $(srcdir)/kwin_lib.po
-	test ! -f kwin_lib.gmo || touch kwin_lib.gmo
+twin_lib.gmo: twin_lib.po
+	rm -f twin_lib.gmo; $(GMSGFMT) -o twin_lib.gmo $(srcdir)/twin_lib.po
+	test ! -f twin_lib.gmo || touch twin_lib.gmo
 kio_settings.gmo: kio_settings.po
 	rm -f kio_settings.gmo; $(GMSGFMT) -o kio_settings.gmo $(srcdir)/kio_settings.po
 	test ! -f kio_settings.gmo || touch kio_settings.gmo
@@ -906,9 +906,9 @@ kcmscreensaver.gmo: kcmscreensaver.po
 konqueror.gmo: konqueror.po
 	rm -f konqueror.gmo; $(GMSGFMT) -o konqueror.gmo $(srcdir)/konqueror.po
 	test ! -f konqueror.gmo || touch konqueror.gmo
-kdesu.gmo: kdesu.po
-	rm -f kdesu.gmo; $(GMSGFMT) -o kdesu.gmo $(srcdir)/kdesu.po
-	test ! -f kdesu.gmo || touch kdesu.gmo
+tdesu.gmo: tdesu.po
+	rm -f tdesu.gmo; $(GMSGFMT) -o tdesu.gmo $(srcdir)/tdesu.po
+	test ! -f tdesu.gmo || touch tdesu.gmo
 kcmsmserver.gmo: kcmsmserver.po
 	rm -f kcmsmserver.gmo; $(GMSGFMT) -o kcmsmserver.gmo $(srcdir)/kcmsmserver.po
 	test ! -f kcmsmserver.gmo || touch kcmsmserver.gmo
@@ -996,21 +996,21 @@ quicklauncher.gmo: quicklauncher.po
 kcmsamba.gmo: kcmsamba.po
 	rm -f kcmsamba.gmo; $(GMSGFMT) -o kcmsamba.gmo $(srcdir)/kcmsamba.po
 	test ! -f kcmsamba.gmo || touch kcmsamba.gmo
-kdeprint_part.gmo: kdeprint_part.po
-	rm -f kdeprint_part.gmo; $(GMSGFMT) -o kdeprint_part.gmo $(srcdir)/kdeprint_part.po
-	test ! -f kdeprint_part.gmo || touch kdeprint_part.gmo
+tdeprint_part.gmo: tdeprint_part.po
+	rm -f tdeprint_part.gmo; $(GMSGFMT) -o tdeprint_part.gmo $(srcdir)/tdeprint_part.po
+	test ! -f tdeprint_part.gmo || touch tdeprint_part.gmo
 kio_smtp.gmo: kio_smtp.po
 	rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po
 	test ! -f kio_smtp.gmo || touch kio_smtp.gmo
 
 #>+ 3
 clean-nls:
-	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \
+	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmtwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home tdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 tdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager twin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmtwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_tdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard twin libkicker khelpcenter ksmserver kgreet_winbind drkonqi twin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror tdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba tdeprint_part kio_smtp ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -1033,7 +1033,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_keramik_config.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlaunch.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminfo.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwinrules.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwinrules.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kasbarextension.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khtmlkttsd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libdmctl.mo
@@ -1054,7 +1054,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkded.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_remote.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_home.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprintfax.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprintfax.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmicons.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/filetypes.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmenergy.mo
@@ -1068,7 +1068,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktip.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kaccess.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_pop3.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesud.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesud.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_fish.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkdnssd.mo
@@ -1099,7 +1099,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlayout.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpager.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_clients.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_clients.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdebugdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnotify.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_nfs.mo
@@ -1110,7 +1110,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kay.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_remotemenu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/lockout.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwindecoration.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwindecoration.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kxkb.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kprinter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtaskmanager.mo
@@ -1119,7 +1119,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcrypto.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnic.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/privacy.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_kdeprint.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_tdeprint.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkonq.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_recentdocs.mo
@@ -1132,19 +1132,19 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_man.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksystraycmd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmartcard.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khelpcenter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kgreet_winbind.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/drkonqi.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_lib.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_lib.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_settings.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksysguard.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfontinst.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/konqueror.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesu.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcolors.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminput.mo
@@ -1174,7 +1174,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkonqhtml.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/quicklauncher.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprint_part.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo
 
 #>+ 2
@@ -1202,10 +1202,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdebase/drkonqi.po b/tde-i18n-ja/messages/kdebase/drkonqi.po
index 9edcd0a5832..3b485c7314c 100644
--- a/tde-i18n-ja/messages/kdebase/drkonqi.po
+++ b/tde-i18n-ja/messages/kdebase/drkonqi.po
@@ -172,8 +172,8 @@ msgid "Startup ID of the program"
 msgstr "プログラムの起動 ID"
 
 #: main.cpp:55
-msgid "The program was started by kdeinit"
-msgstr "プログラムは kdeinit によって起動されました"
+msgid "The program was started by tdeinit"
+msgstr "プログラムは tdeinit によって起動されました"
 
 #: main.cpp:56
 msgid "Disable arbitrary disk access"
diff --git a/tde-i18n-ja/messages/kdebase/kcmcrypto.po b/tde-i18n-ja/messages/kdebase/kcmcrypto.po
index dfb0b056011..61375fd6b07 100644
--- a/tde-i18n-ja/messages/kdebase/kcmcrypto.po
+++ b/tde-i18n-ja/messages/kdebase/kcmcrypto.po
@@ -662,9 +662,9 @@ msgstr "利用可能にしない"
 
 #: crypto.cpp:2012
 msgid ""
-"Could not execute Kleopatra. You might have to install or update the kdepim "
+"Could not execute Kleopatra. You might have to install or update the tdepim "
 "package."
-msgstr "Kleopatra を実行できませんでした。kdepim パッケージをインストールまたはアップデートしてください。"
+msgstr "Kleopatra を実行できませんでした。tdepim パッケージをインストールまたはアップデートしてください。"
 
 #: crypto.cpp:2030
 msgid ""
diff --git a/tde-i18n-ja/messages/kdebase/kcmkeys.po b/tde-i18n-ja/messages/kdebase/kcmkeys.po
index 32404fe48b1..e27d6e6865e 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkeys.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkeys.po
@@ -293,383 +293,383 @@ msgstr ""
 msgid "Application Missing"
 msgstr "アプリケーションがありません"
 
-#: ../../kwin/kwinbindings.cpp:18
+#: ../../twin/twinbindings.cpp:18
 msgid "System"
 msgstr "システム"
 
-#: ../../kwin/kwinbindings.cpp:20
+#: ../../twin/twinbindings.cpp:20
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: ../../kwin/kwinbindings.cpp:21
+#: ../../twin/twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "ウィンドウを巡回"
 
-#: ../../kwin/kwinbindings.cpp:22
+#: ../../twin/twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "ウィンドウを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:23
+#: ../../twin/twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "デスクトップを巡回"
 
-#: ../../kwin/kwinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "デスクトップを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "デスクトップリストを巡回"
 
-#: ../../kwin/kwinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "デスクトップリストを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:28
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: ../../kwin/kwinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "ウィンドウ操作メニュー"
 
-#: ../../kwin/kwinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:30
 msgid "Close Window"
 msgstr "ウィンドウを閉じる"
 
-#: ../../kwin/kwinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "ウィンドウを最大化"
 
-#: ../../kwin/kwinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "ウィンドウを縦に最大化"
 
-#: ../../kwin/kwinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "ウィンドウを横に最大化"
 
-#: ../../kwin/kwinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "ウィンドウを最小化"
 
-#: ../../kwin/kwinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "ウィンドウをシェード"
 
-#: ../../kwin/kwinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:42
 msgid "Move Window"
 msgstr "ウィンドウを移動"
 
-#: ../../kwin/kwinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "ウィンドウをリサイズ"
 
-#: ../../kwin/kwinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "ウィンドウを前面に"
 
-#: ../../kwin/kwinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "ウィンドウを背面に"
 
-#: ../../kwin/kwinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "ウィンドウを前面/背面に"
 
-#: ../../kwin/kwinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "ウィンドウをフルスクリーンに"
 
-#: ../../kwin/kwinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "ウィンドウの枠を隠す"
 
-#: ../../kwin/kwinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "ウィンドウを常に他より上に"
 
-#: ../../kwin/kwinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "ウィンドウを常に他より下に"
 
-#: ../../kwin/kwinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "操作を要求しているウィンドウをアクティブに"
 
-#: ../../kwin/kwinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "ウィンドウショートカットの設定"
 
-#: ../../kwin/kwinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "ウィンドウを右寄せ"
 
-#: ../../kwin/kwinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "ウィンドウを左寄せ"
 
-#: ../../kwin/kwinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "ウィンドウを上寄せ"
 
-#: ../../kwin/kwinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "ウィンドウを下寄せ"
 
-#: ../../kwin/kwinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "ウィンドウを右へ伸ばす"
 
-#: ../../kwin/kwinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "ウィンドウを下へ伸ばす"
 
-#: ../../kwin/kwinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "ウィンドウを左へ縮める"
 
-#: ../../kwin/kwinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "ウィンドウを上へ縮める"
 
-#: ../../kwin/kwinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "ウィンドウをデスクトップへ移動"
 
-#: ../../kwin/kwinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "ウィンドウをすべてのデスクトップに配置"
 
-#: ../../kwin/kwinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "ウィンドウをデスクトップ 1 へ"
 
-#: ../../kwin/kwinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "ウィンドウをデスクトップ 2 へ"
 
-#: ../../kwin/kwinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "ウィンドウをデスクトップ 3 へ"
 
-#: ../../kwin/kwinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "ウィンドウをデスクトップ 4 へ"
 
-#: ../../kwin/kwinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "ウィンドウをデスクトップ 5 へ"
 
-#: ../../kwin/kwinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "ウィンドウをデスクトップ 6 へ"
 
-#: ../../kwin/kwinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "ウィンドウをデスクトップ 7 へ"
 
-#: ../../kwin/kwinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "ウィンドウをデスクトップ 8 へ"
 
-#: ../../kwin/kwinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "ウィンドウをデスクトップ 9 へ"
 
-#: ../../kwin/kwinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "ウィンドウをデスクトップ 10 へ"
 
-#: ../../kwin/kwinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "ウィンドウをデスクトップ 11 へ"
 
-#: ../../kwin/kwinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "ウィンドウをデスクトップ 12 へ"
 
-#: ../../kwin/kwinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "ウィンドウをデスクトップ 13 へ"
 
-#: ../../kwin/kwinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "ウィンドウをデスクトップ 14 へ"
 
-#: ../../kwin/kwinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "ウィンドウをデスクトップ 15 へ"
 
-#: ../../kwin/kwinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "ウィンドウをデスクトップ 16 へ"
 
-#: ../../kwin/kwinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "ウィンドウをデスクトップ 17 へ"
 
-#: ../../kwin/kwinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "ウィンドウをデスクトップ 18 へ"
 
-#: ../../kwin/kwinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "ウィンドウをデスクトップ 19 へ"
 
-#: ../../kwin/kwinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "ウィンドウをデスクトップ 20 へ"
 
-#: ../../kwin/kwinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "ウィンドウを次のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "ウィンドウを前のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "ウィンドウを一つ右のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "ウィンドウを一つ左のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "ウィンドウを一つ上のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "ウィンドウを一つ下のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "デスクトップの切り替え"
 
-#: ../../kwin/kwinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "デスクトップ 1 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "デスクトップ 2 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "デスクトップ 3 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "デスクトップ 4 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "デスクトップ 5 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "デスクトップ 6 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "デスクトップ 7 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "デスクトップ 8 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "デスクトップ 9 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "デスクトップ 10 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "デスクトップ 11 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "デスクトップ 12 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "デスクトップ 13 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "デスクトップ 14 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "デスクトップ 15 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "デスクトップ 16 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "デスクトップ 17 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "デスクトップ 18 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "デスクトップ 19 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "デスクトップ 20 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "次のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "前のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "一つ右のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "一つ左のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "一つ上のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "一つ下のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "マウスエミュレーション"
 
-#: ../../kwin/kwinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "ウィンドウを強制終了"
 
-#: ../../kwin/kwinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "ウィンドウのスクリーンショット"
 
-#: ../../kwin/kwinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "デスクトップのスクリーンショット"
 
-#: ../../kwin/kwinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "グローバルショートカットをブロック"
 
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po b/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
index 75ca32affcf..001f48171f3 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
@@ -1,4 +1,4 @@
-# translation of kcmkwindecoration.po to Japanese
+# translation of kcmtwindecoration.po to Japanese
 # Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # Taiki Komoda <[email protected]>, 2002.
 # Toyohiro Asukai <[email protected]>, 2004.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkwindecoration\n"
+"Project-Id-Version: kcmtwindecoration\n"
 "POT-Creation-Date: 2005-10-28 02:43+0200\n"
 "PO-Revision-Date: 2006-11-14 22:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -88,30 +88,30 @@ msgstr "メニュー"
 msgid "--- spacer ---"
 msgstr "--- スペーサー ---"
 
-#: kwindecoration.cpp:90
+#: twindecoration.cpp:90
 msgid ""
 "Select the window decoration. This is the look and feel of both the window "
 "borders and the window handle."
 msgstr "ウィンドウ装飾のテーマを選択してください。これはウィンドウの枠とハンドルの外観を決定します。"
 
-#: kwindecoration.cpp:95
+#: twindecoration.cpp:95
 msgid "Decoration Options"
 msgstr "装飾オプション"
 
-#: kwindecoration.cpp:105
+#: twindecoration.cpp:105
 msgid "B&order size:"
 msgstr "枠のサイズ(&O):"
 
-#: kwindecoration.cpp:108
+#: twindecoration.cpp:108
 msgid "Use this combobox to change the border size of the decoration."
 msgstr "このコンボボックスを使って、装飾の枠の大きさを変更します。"
 
 # ACCELERATOR changed by translator
-#: kwindecoration.cpp:124
+#: twindecoration.cpp:124
 msgid "&Show window button tooltips"
 msgstr "ウィンドウボタンにツールチップを表示する(&T)"
 
-#: kwindecoration.cpp:126
+#: twindecoration.cpp:126
 msgid ""
 "Enabling this checkbox will show window button tooltips. If this checkbox is "
 "off, no window button tooltips will be shown."
@@ -119,69 +119,69 @@ msgstr ""
 "このオプションを有効にすると、ウィンドウボタンの上にマウスカーソルを移動したときに、それぞれの機能がポップアップに表示されます。有効でない場合は、何も表示されま"
 "せん。"
 
-#: kwindecoration.cpp:130
+#: twindecoration.cpp:130
 msgid "Use custom titlebar button &positions"
 msgstr "タイトルバーのボタンの位置を指定する(&P)"
 
-#: kwindecoration.cpp:132
+#: twindecoration.cpp:132
 msgid ""
 "The appropriate settings can be found in the \"Buttons\" Tab; please note that "
 "this option is not available on all styles yet."
 msgstr "これに対応する設定項目は「ボタン」タブにあります。ただし、すべてのスタイルでこのオプションが使えるわけではありません。"
 
-#: kwindecoration.cpp:163
+#: twindecoration.cpp:163
 msgid "&Window Decoration"
 msgstr "ウィンドウ装飾(&W)"
 
-#: kwindecoration.cpp:164
+#: twindecoration.cpp:164
 msgid "&Buttons"
 msgstr "ボタン(&B)"
 
-#: kwindecoration.cpp:182
-msgid "kcmkwindecoration"
-msgstr "kcmkwindecoration"
+#: twindecoration.cpp:182
+msgid "kcmtwindecoration"
+msgstr "kcmtwindecoration"
 
-#: kwindecoration.cpp:183
+#: twindecoration.cpp:183
 msgid "Window Decoration Control Module"
 msgstr "ウィンドウ装飾コントロールモジュール"
 
-#: kwindecoration.cpp:185
+#: twindecoration.cpp:185
 msgid "(c) 2001 Karol Szwed"
 msgstr "(c) 2001 Karol Szwed"
 
-#: kwindecoration.cpp:237 kwindecoration.cpp:439
+#: twindecoration.cpp:237 twindecoration.cpp:439
 msgid "KDE 2"
 msgstr "KDE 2"
 
-#: kwindecoration.cpp:266
+#: twindecoration.cpp:266
 msgid "Tiny"
 msgstr "極小"
 
-#: kwindecoration.cpp:267
+#: twindecoration.cpp:267
 msgid "Normal"
 msgstr "標準"
 
-#: kwindecoration.cpp:268
+#: twindecoration.cpp:268
 msgid "Large"
 msgstr "大"
 
-#: kwindecoration.cpp:269
+#: twindecoration.cpp:269
 msgid "Very Large"
 msgstr "とても大"
 
-#: kwindecoration.cpp:270
+#: twindecoration.cpp:270
 msgid "Huge"
 msgstr "巨大"
 
-#: kwindecoration.cpp:271
+#: twindecoration.cpp:271
 msgid "Very Huge"
 msgstr "とても巨大"
 
-#: kwindecoration.cpp:272
+#: twindecoration.cpp:272
 msgid "Oversized"
 msgstr "特大"
 
-#: kwindecoration.cpp:591
+#: twindecoration.cpp:591
 msgid ""
 "<h1>Window Manager Decoration</h1>"
 "<p>This module allows you to choose the window border decorations, as well as "
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwinrules.po b/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
index 8f4c7355106..6a0590f24bd 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
@@ -1,11 +1,11 @@
-# translation of kcmkwinrules.po to Japanese
+# translation of kcmtwinrules.po to Japanese
 # Kenshi Muto <[email protected]>, 2004.
 # Fumiaki Okushi <[email protected]>, 2005.
 # Shinichi Tsunoda <[email protected]>, 2005.
 # Yukiko Bando <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkwinrules\n"
+"Project-Id-Version: kcmtwinrules\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -92,8 +92,8 @@ msgid "Unknown - will be treated as Normal Window"
 msgstr "不明 - 標準ウィンドウとして扱います"
 
 #: kcm.cpp:49
-msgid "kcmkwinrules"
-msgstr "kcmkwinrules"
+msgid "kcmtwinrules"
+msgstr "kcmtwinrules"
 
 #: kcm.cpp:50
 msgid "Window-Specific Settings Configuration Module"
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwm.po b/tde-i18n-ja/messages/kdebase/kcmkwm.po
index aa24b85d2b2..7f4b477e42b 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwm.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwm.po
@@ -59,8 +59,8 @@ msgid "&Translucency"
 msgstr "半透明(&T)"
 
 #: main.cpp:126
-msgid "kcmkwinoptions"
-msgstr "kcmkwinoptions"
+msgid "kcmtwinoptions"
+msgstr "kcmtwinoptions"
 
 #: main.cpp:126
 msgid "Window Behavior Configuration Module"
@@ -939,7 +939,7 @@ msgid ""
 "<qt><b>It seems that alpha channel support is not available.</b>"
 "<br>"
 "<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with kwin."
+"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
 "<br>Also, make sure you have the following entries in your XConfig (e.g. "
 "/etc/X11/xorg.conf):"
 "<br>"
@@ -956,7 +956,7 @@ msgstr ""
 "<qt><b>アルファチャネルのサポートが利用できないようです。</b>"
 "<br>"
 "<br><a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a> "
-"と、kwin に同梱されている kompmgr がインストールされているか確認してください。"
+"と、twin に同梱されている kompmgr がインストールされているか確認してください。"
 "<br>また、XConfig (例えば /etc/X11/xorg.conf) に次のエントリがあることを確認してください:"
 "<br>"
 "<br><i>Section \"Extensions\""
diff --git a/tde-i18n-ja/messages/kdebase/kcmsmartcard.po b/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
index 1c0f8507299..a185a6ddfd2 100644
--- a/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
+++ b/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
@@ -45,17 +45,17 @@ msgstr "考えられる理由"
 msgid ""
 "\n"
 "1) The KDE daemon, 'kded' is not running. You can restart it by running the "
-"command 'kdeinit' and then try reloading the KDE Control Center to see if this "
+"command 'tdeinit' and then try reloading the KDE Control Center to see if this "
 "message goes away.\n"
 "\n"
 "2) You don't appear to have smartcard support in the KDE libraries. You will "
-"need to recompile the kdelibs package with libpcsclite installed."
+"need to recompile the tdelibs package with libpcsclite installed."
 msgstr ""
 "\n"
-"1) KDE デーモン 'kded' が実行されていない。kdeinit コマンドで再起動してから、KDE "
+"1) KDE デーモン 'kded' が実行されていない。tdeinit コマンドで再起動してから、KDE "
 "コントロールセンターを再度立ち上げて、エラーメッセージが消えるかどうか試してみてください。\n"
 "\n"
-"2) KDE ライブラリにスマートカードサポートが含まれていない。libpcsclite をインストールしてから kdelibs "
+"2) KDE ライブラリにスマートカードサポートが含まれていない。libpcsclite をインストールしてから tdelibs "
 "をコンパイルし直す必要があります。"
 
 #. i18n: file smartcardbase.ui line 31
diff --git a/tde-i18n-ja/messages/kdebase/kdeprint_part.po b/tde-i18n-ja/messages/kdebase/kdeprint_part.po
index cebbe0b743c..9bcd9f82b9b 100644
--- a/tde-i18n-ja/messages/kdebase/kdeprint_part.po
+++ b/tde-i18n-ja/messages/kdebase/kdeprint_part.po
@@ -1,9 +1,9 @@
-# translation of kdeprint_part.po to Japanese.
+# translation of tdeprint_part.po to Japanese.
 # Noboru Sinohara <[email protected]>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprint_part VERSION\n"
+"Project-Id-Version: tdeprint_part VERSION\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2002-07-10 01:02+0900\n"
 "Last-Translator: Noboru Sinohara <[email protected]>\n"
@@ -26,14 +26,14 @@ msgid ""
 msgstr "[email protected]"
 
 #: printpart.cpp:59
-msgid "kdeprint_part"
-msgstr "kdeprint_part"
+msgid "tdeprint_part"
+msgstr "tdeprint_part"
 
 #: printpart.cpp:59
 msgid "A Konqueror Plugin for Print Management"
 msgstr "印刷管理のための Konqueror プラグイン"
 
-#. i18n: file kdeprint_part.rc line 3
+#. i18n: file tdeprint_part.rc line 3
 #: rc.cpp:3 rc.cpp:6
 #, no-c-format
 msgid "Print Manager Toolbar"
diff --git a/tde-i18n-ja/messages/kdebase/kdeprintfax.po b/tde-i18n-ja/messages/kdebase/kdeprintfax.po
index 18b42dd48a8..76b2c2dc985 100644
--- a/tde-i18n-ja/messages/kdebase/kdeprintfax.po
+++ b/tde-i18n-ja/messages/kdebase/kdeprintfax.po
@@ -1,4 +1,4 @@
-# translation of kdeprintfax.po to Japanese
+# translation of tdeprintfax.po to Japanese
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Toyohiro Asukai <[email protected]>, 2004.
 # Kurose Shushi <[email protected]>, 2004.
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprintfax\n"
+"Project-Id-Version: tdeprintfax\n"
 "POT-Creation-Date: 2006-04-28 03:54+0200\n"
 "PO-Revision-Date: 2006-05-20 15:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -143,8 +143,8 @@ msgid ""
 msgstr "[email protected],[email protected],[email protected]"
 
 #: main.cpp:33
-msgid "A small fax utility to be used with kdeprint."
-msgstr "kdeprint で使用する小さなファクスユーティリティ"
+msgid "A small fax utility to be used with tdeprint."
+msgstr "tdeprint で使用する小さなファクスユーティリティ"
 
 #: main.cpp:39
 msgid "Phone number to fax to"
@@ -178,7 +178,7 @@ msgstr "MIME タイプ:"
 msgid "Command:"
 msgstr "コマンド:"
 
-#. i18n: file kdeprintfaxui.rc line 10
+#. i18n: file tdeprintfaxui.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Fa&x"
@@ -248,11 +248,11 @@ msgstr "フィルタ"
 msgid "Filters Configuration"
 msgstr "フィルタの設定"
 
-#: faxab.cpp:41 kdeprintfax.cpp:88
+#: faxab.cpp:41 tdeprintfax.cpp:88
 msgid "Name"
 msgstr "名前"
 
-#: faxab.cpp:42 kdeprintfax.cpp:87 kdeprintfax.cpp:562
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
 msgid "Fax Number"
 msgstr "ファクス番号"
 
@@ -268,143 +268,143 @@ msgstr "アドレス帳を編集(&E)"
 msgid "No fax number found in your address book."
 msgstr "アドレス帳にファクス番号が見つかりません。"
 
-#: kdeprintfax.cpp:74
+#: tdeprintfax.cpp:74
 msgid "Move up"
 msgstr "上に移動"
 
-#: kdeprintfax.cpp:79
+#: tdeprintfax.cpp:79
 msgid "Move down"
 msgstr "下に移動"
 
-#: kdeprintfax.cpp:82
+#: tdeprintfax.cpp:82
 msgid "F&iles:"
 msgstr "ファイル(&I):"
 
-#: kdeprintfax.cpp:89
+#: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "会社"
 
-#: kdeprintfax.cpp:96
+#: tdeprintfax.cpp:96
 msgid "Add fax number"
 msgstr "ファクス番号を追加"
 
-#: kdeprintfax.cpp:100
+#: tdeprintfax.cpp:100
 msgid "Add fax number from addressbook"
 msgstr "アドレス帳からファクス番号を追加"
 
-#: kdeprintfax.cpp:104
+#: tdeprintfax.cpp:104
 msgid "Remove fax number"
 msgstr "ファクス番号を削除"
 
-#: kdeprintfax.cpp:107
+#: tdeprintfax.cpp:107
 msgid "&Comment:"
 msgstr "コメント(&C):"
 
-#: kdeprintfax.cpp:118
+#: tdeprintfax.cpp:118
 msgid "Sched&ule:"
 msgstr "スケジュール(&U):"
 
-#: kdeprintfax.cpp:120
+#: tdeprintfax.cpp:120
 msgid "Now"
 msgstr "今"
 
-#: kdeprintfax.cpp:121
+#: tdeprintfax.cpp:121
 msgid "At Specified Time"
 msgstr "指定の時刻に"
 
-#: kdeprintfax.cpp:128
+#: tdeprintfax.cpp:128
 msgid "Send Co&ver Sheet"
 msgstr "表紙を送る(&V)"
 
-#: kdeprintfax.cpp:131
+#: tdeprintfax.cpp:131
 msgid "Su&bject:"
 msgstr "件名(&B):"
 
-#: kdeprintfax.cpp:172 kdeprintfax.cpp:252
+#: tdeprintfax.cpp:172 tdeprintfax.cpp:252
 msgid "Processing..."
 msgstr "処理中..."
 
-#: kdeprintfax.cpp:173 kdeprintfax.cpp:402
+#: tdeprintfax.cpp:173 tdeprintfax.cpp:402
 msgid "Idle"
 msgstr "アイドル中"
 
-#: kdeprintfax.cpp:177
+#: tdeprintfax.cpp:177
 msgid "Send to Fax"
 msgstr "ファクスに送信"
 
-#: kdeprintfax.cpp:191
+#: tdeprintfax.cpp:191
 msgid "&Add File..."
 msgstr "ファイルを追加(&A)..."
 
-#: kdeprintfax.cpp:192
+#: tdeprintfax.cpp:192
 msgid "&Remove File"
 msgstr "ファイルを削除(&R)"
 
-#: kdeprintfax.cpp:193
+#: tdeprintfax.cpp:193
 msgid "&Send Fax"
 msgstr "ファクスを送信(&S)"
 
-#: kdeprintfax.cpp:194
+#: tdeprintfax.cpp:194
 msgid "A&bort"
 msgstr "中止(&B)"
 
-#: kdeprintfax.cpp:195
+#: tdeprintfax.cpp:195
 msgid "A&ddress Book"
 msgstr "アドレス帳(&D)"
 
-#: kdeprintfax.cpp:196
+#: tdeprintfax.cpp:196
 msgid "V&iew Log"
 msgstr "ログを見る(&I)"
 
-#: kdeprintfax.cpp:197
+#: tdeprintfax.cpp:197
 msgid "Vi&ew File"
 msgstr "ファイルを見る(&E)..."
 
-#: kdeprintfax.cpp:198
+#: tdeprintfax.cpp:198
 msgid "&New Fax Recipient..."
 msgstr "新しいファクス受取人(&N)..."
 
-#: kdeprintfax.cpp:245
+#: tdeprintfax.cpp:245
 msgid "No file to fax."
 msgstr "ファクスするファイルがありません。"
 
-#: kdeprintfax.cpp:247
+#: tdeprintfax.cpp:247
 msgid "No fax number specified."
 msgstr "ファクス番号が指定されていません。"
 
-#: kdeprintfax.cpp:255
+#: tdeprintfax.cpp:255
 msgid "Unable to start Fax process."
 msgstr "ファクスプロセスを開始できません。"
 
-#: kdeprintfax.cpp:261
+#: tdeprintfax.cpp:261
 msgid "Unable to stop Fax process."
 msgstr "ファクスプロセスを終了できません。"
 
-#: kdeprintfax.cpp:284
+#: tdeprintfax.cpp:284
 #, c-format
 msgid "Unable to retrieve %1."
 msgstr "%1 を取得できません。"
 
-#: kdeprintfax.cpp:409
+#: tdeprintfax.cpp:409
 msgid "Fax error: see log message for more information."
 msgstr "ファクスエラー: 詳しい情報はログを見てください。"
 
-#: kdeprintfax.cpp:564
+#: tdeprintfax.cpp:564
 msgid "Enter recipient fax properties."
 msgstr "受取人のファクス情報を入力してください。"
 
-#: kdeprintfax.cpp:565
+#: tdeprintfax.cpp:565
 msgid "&Number:"
 msgstr "番号(&N):"
 
-#: kdeprintfax.cpp:566
+#: tdeprintfax.cpp:566
 msgid "N&ame:"
 msgstr "名前(&A):"
 
-#: kdeprintfax.cpp:567
+#: tdeprintfax.cpp:567
 msgid "&Enterprise:"
 msgstr "会社(&E):"
 
-#: kdeprintfax.cpp:593
+#: tdeprintfax.cpp:593
 msgid "Invalid fax number."
 msgstr "無効なファクス番号です。"
diff --git a/tde-i18n-ja/messages/kdebase/kdesu.po b/tde-i18n-ja/messages/kdebase/kdesu.po
index 51395b2ee36..8fbed73cb76 100644
--- a/tde-i18n-ja/messages/kdebase/kdesu.po
+++ b/tde-i18n-ja/messages/kdebase/kdesu.po
@@ -1,4 +1,4 @@
-# translation of kdesu.po to Japanese
+# translation of tdesu.po to Japanese
 # KTranslator Generated File
 # Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # Noboru Sinohara <[email protected]>, 2002.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdesu\n"
+"Project-Id-Version: tdesu\n"
 "POT-Creation-Date: 2007-11-14 01:15+0100\n"
 "PO-Revision-Date: 2007-04-13 18:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -19,98 +19,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kdesu.cpp:56 kdesu.cpp:57
+#: tdesu.cpp:56 tdesu.cpp:57
 msgid "Specifies the command to run"
 msgstr "実行するコマンドを指定"
 
-#: kdesu.cpp:58
+#: tdesu.cpp:58
 msgid "Run command under target uid if <file> is not writable"
 msgstr "<file> が書き込み不可であればターゲット uid でコマンドを実行"
 
-#: kdesu.cpp:59
+#: tdesu.cpp:59
 msgid "Specifies the target uid"
 msgstr "ターゲット uid を指定"
 
-#: kdesu.cpp:60
+#: tdesu.cpp:60
 msgid "Do not keep password"
 msgstr "パスワードを保持しない"
 
-#: kdesu.cpp:61
+#: tdesu.cpp:61
 msgid "Stop the daemon (forgets all passwords)"
 msgstr "デーモンを停止 (すべてのパスワードを消去)"
 
-#: kdesu.cpp:62
+#: tdesu.cpp:62
 msgid "Enable terminal output (no password keeping)"
 msgstr "端末出力を有効に (パスワードは保持しない)"
 
-#: kdesu.cpp:63
+#: tdesu.cpp:63
 msgid "Set priority value: 0 <= prio <= 100, 0 is lowest"
 msgstr "優先度の設定: 0 <= 優先度 <= 100、0 が最小"
 
-#: kdesu.cpp:64
+#: tdesu.cpp:64
 msgid "Use realtime scheduling"
 msgstr "リアルタイムスケジューリングを使う"
 
-#: kdesu.cpp:65
+#: tdesu.cpp:65
 msgid "Let command use existing dcopserver"
 msgstr "コマンドに既存の DCOP サーバを使わせる"
 
-#: kdesu.cpp:66
+#: tdesu.cpp:66
 msgid "Do not display ignore button"
 msgstr "「無視」ボタンを表示しない"
 
-#: kdesu.cpp:67
+#: tdesu.cpp:67
 msgid "Specify icon to use in the password dialog"
 msgstr "パスワードダイアログで使用するアイコンを指定する"
 
-#: kdesu.cpp:68
+#: tdesu.cpp:68
 msgid "Do not show the command to be run in the dialog"
 msgstr "ダイアログで実行されるコマンドを表示しない"
 
-#: kdesu.cpp:99
+#: tdesu.cpp:99
 msgid "KDE su"
 msgstr "KDE su"
 
-#: kdesu.cpp:100
+#: tdesu.cpp:100
 msgid "Runs a program with elevated privileges."
 msgstr "上位の権限でプログラムを実行します。"
 
-#: kdesu.cpp:103
+#: tdesu.cpp:103
 msgid "Maintainer"
 msgstr "メンテナ"
 
-#: kdesu.cpp:105
+#: tdesu.cpp:105
 msgid "Original author"
 msgstr "オリジナルの作者"
 
-#: kdesu.cpp:131
+#: tdesu.cpp:131
 msgid "Command '%1' not found."
 msgstr "コマンド '%1' が見つかりません。"
 
-#: kdesu.cpp:207
+#: tdesu.cpp:207
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "無効な優先度: %1"
 
-#: kdesu.cpp:235
+#: tdesu.cpp:235
 msgid "No command specified."
 msgstr "コマンドが指定されていません。"
 
-#: kdesu.cpp:344
+#: tdesu.cpp:344
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "su がエラーを返しました。\n"
 
-#: kdesu.cpp:365
+#: tdesu.cpp:365
 msgid "Command:"
 msgstr "コマンド:"
 
-#: kdesu.cpp:370
+#: tdesu.cpp:370
 msgid "realtime: "
 msgstr "リアルタイム:"
 
-#: kdesu.cpp:373
+#: tdesu.cpp:373
 msgid "Priority:"
 msgstr "優先度:"
 
diff --git a/tde-i18n-ja/messages/kdebase/kdesud.po b/tde-i18n-ja/messages/kdebase/kdesud.po
index 944d7a7ae6c..e9e63be352d 100644
--- a/tde-i18n-ja/messages/kdebase/kdesud.po
+++ b/tde-i18n-ja/messages/kdebase/kdesud.po
@@ -1,9 +1,9 @@
-# translation of kdesud.po to Japanese.
+# translation of tdesud.po to Japanese.
 # Sinohara <[email protected]>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdesud VERSION\n"
+"Project-Id-Version: tdesud VERSION\n"
 "POT-Creation-Date: 2005-07-23 01:32+0200\n"
 "PO-Revision-Date: 2001-01-10 23:12GMT\n"
 "Last-Translator: Sinohara <[email protected]>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.7.1\n"
 
-#: kdesud.cpp:251
+#: tdesud.cpp:251
 msgid "KDE su daemon"
 msgstr "KDE su デーモン"
 
-#: kdesud.cpp:252
-msgid "Daemon used by kdesu"
-msgstr "kdesu が使用するデーモン"
+#: tdesud.cpp:252
+msgid "Daemon used by tdesu"
+msgstr "tdesu が使用するデーモン"
 
-#: kdesud.cpp:255
+#: tdesud.cpp:255
 msgid "Author"
 msgstr "作者"
 
diff --git a/tde-i18n-ja/messages/kdebase/ksmserver.po b/tde-i18n-ja/messages/kdebase/ksmserver.po
index d9c4ecb5583..ee0898183d0 100644
--- a/tde-i18n-ja/messages/kdebase/ksmserver.po
+++ b/tde-i18n-ja/messages/kdebase/ksmserver.po
@@ -48,10 +48,10 @@ msgstr "可能なら保存されたセッションを復元"
 #: main.cpp:37
 msgid ""
 "Starts 'wm' in case no other window manager is \n"
-"participating in the session. Default is 'kwin'"
+"participating in the session. Default is 'twin'"
 msgstr ""
 "他のウィンドウマネージャが存在しないときに\n"
-"'wm' を起動します。標準では 'kwin' です。"
+"'wm' を起動します。標準では 'twin' です。"
 
 #: main.cpp:38
 msgid "Also allow remote connections"
diff --git a/tde-i18n-ja/messages/kdebase/ktip.po b/tde-i18n-ja/messages/kdebase/ktip.po
index 84b4161a884..a77b45d4131 100644
--- a/tde-i18n-ja/messages/kdebase/ktip.po
+++ b/tde-i18n-ja/messages/kdebase/ktip.po
@@ -51,7 +51,7 @@ msgid ""
 "also useful sites for major applications like\n"
 "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
 "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>, or important\n"
+"<A HREF=\"http://www.tdevelop.org/\">KDevelop</A>, or important\n"
 "KDE utilities like\n"
 "<A HREF=\"http://printing.kde.org/\">KDEPrint</A>,\n"
 "which can be put to its full usage even outside KDE...\n"
@@ -65,7 +65,7 @@ msgstr ""
 "KDE に関する多くの情報は <A HREF=\"http://www.kde.org/\">KDE ウェブサイト</A> "
 "で入手できます。主要なアプリケーションについては <A HREF=\"http://www.konqueror.org/\">Konqueror</A>"
 ", <A HREF=\"http://www.koffice.org/\">KOffice</A>, <A "
-"HREF=\"http://www.kdevelop.org/\">KDevelop</A> のような役立つサイトもあります。また、<A "
+"HREF=\"http://www.tdevelop.org/\">KDevelop</A> のような役立つサイトもあります。また、<A "
 "HREF=\"http://printing.kde.org/\">KDEPrint</A> のような KDE "
 "以外でも使用できるユーティリティに関するサイトもあります。</p>\n"
 "<br>\n"
@@ -540,7 +540,7 @@ msgid ""
 "<p>\n"
 "Need comprehensive info about KDEPrinting?"
 "<br> </p>\n"
-"<p> Type <strong>help:/kdeprint/</strong> into a Konqueror address field\n"
+"<p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field\n"
 "and get the\n"
 " <a href=\"http://printing.kde.org/documentation/handbook/\">"
 "KDEPrint Handbook</a>\n"
@@ -550,7 +550,7 @@ msgid ""
 " <a href=\"http://printing.kde.org/documentation/tutorials/\">Tutorials</a>,\n"
 "a \"TipsNTricks\" section and the\n"
 " <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"kdeprint mailing list</a>)\n"
+"tdeprint mailing list</a>)\n"
 " are available at\n"
 "<a href=\"http://printing.kde.org/\">printing.kde.org</a>...\n"
 "</p>\n"
@@ -560,7 +560,7 @@ msgstr ""
 "<p>\n"
 "KDEPrinting に関する総合的な情報が必要ですか？"
 "<br></p>\n"
-"<p>Konqueror のアドレスフィールドに <strong>help:/kdeprint/</strong> "
+"<p>Konqueror のアドレスフィールドに <strong>help:/tdeprint/</strong> "
 "と入力すると、<a href=\"http://printing.kde.org/documentation/handbook/\">"
 "KDEPrint ハンドブック</a>\n"
 "が開きます。</p>"
@@ -568,7 +568,7 @@ msgstr ""
 "では、この他にも <a href=\"http://printing.kde.org/faq/\">FAQ</a>"
 "、<a href=\"http://printing.kde.org/documentation/tutorials/\">さまざまなチュートリアル</a>"
 "、「ヒントと小技」、そして <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"kdeprint メーリングリスト</a> などをご利用いただけます。</p>\n"
+"tdeprint メーリングリスト</a> などをご利用いただけます。</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 
@@ -793,7 +793,7 @@ msgid ""
 "<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
 "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
 " StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
-"<p>See <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>See <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a>\n"
 "for more detailed hints...\n"
 "</p>\n"
@@ -804,7 +804,7 @@ msgstr ""
 "<p>KDE の印刷機能は KDE 以外のアプリケーションでも利用できます。</p>\n"
 "<p><strong>'kprinter'</strong> を印刷コマンドとして使ってください。Netscape, Mozzila, Galeon, gv, "
 "AcrobatReader, StarOffice, OpenOffice, さらに GNOME アプリケーションその他でも使用できます。</p>\n"
-"<p>詳細については <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>詳細については <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a> を参照してください。</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
@@ -920,7 +920,7 @@ msgid ""
 "You may specify print files and/or name a printer from the command line:\n"
 "<pre>\n"
 "kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
-"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
+"../tdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
 "</pre>\n"
 " This prints 3 different files (from different folders) to printer "
 "\"infotec\".\n"
@@ -933,7 +933,7 @@ msgstr ""
 "<p>\n"
 "コマンドラインからでも印刷するファイルやプリンタ名を指定できます:\n"
 "<pre> kprinter -d infotec \\\n          /home/kurt/paragliding.jpg \\\n "
-"../kdeprint-handbook.pdf \\\n          /opt/kde3/flyer.ps\n"
+"../tdeprint-handbook.pdf \\\n          /opt/kde3/flyer.ps\n"
 "</pre>\n"
 "このようにすると、異なるフォルダにある 3 つのファイルをプリンタ \"infosec\" で印刷します。\n"
 "</p>\n"
diff --git a/tde-i18n-ja/messages/kdebase/kwin.po b/tde-i18n-ja/messages/kdebase/kwin.po
index 991e7f9bc2b..37edc7e8732 100644
--- a/tde-i18n-ja/messages/kdebase/kwin.po
+++ b/tde-i18n-ja/messages/kdebase/kwin.po
@@ -1,4 +1,4 @@
-# translation of kwin.po to Japanese
+# translation of twin.po to Japanese
 # KTranslator Generated File
 # Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
@@ -10,7 +10,7 @@
 # Yukiko Bando <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin\n"
+"Project-Id-Version: twin\n"
 "POT-Creation-Date: 2008-03-10 01:27+0100\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -39,403 +39,403 @@ msgstr ""
 msgid "Window '%1' demands attention."
 msgstr "ウィンドウ '%1' が操作を要求しています。"
 
-#: kwinbindings.cpp:18
+#: twinbindings.cpp:18
 msgid "System"
 msgstr "システム"
 
-#: kwinbindings.cpp:20
+#: twinbindings.cpp:20
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: kwinbindings.cpp:21
+#: twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "ウィンドウを巡回"
 
-#: kwinbindings.cpp:22
+#: twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "ウィンドウを巡回 (反対回り)"
 
-#: kwinbindings.cpp:23
+#: twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "デスクトップを巡回"
 
-#: kwinbindings.cpp:24
+#: twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "デスクトップを巡回 (反対回り)"
 
-#: kwinbindings.cpp:25
+#: twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "デスクトップリストを巡回"
 
-#: kwinbindings.cpp:26
+#: twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "デスクトップリストを巡回 (反対回り)"
 
-#: kwinbindings.cpp:28
+#: twinbindings.cpp:28
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: kwinbindings.cpp:29
+#: twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "ウィンドウ操作メニュー"
 
-#: kwinbindings.cpp:30
+#: twinbindings.cpp:30
 msgid "Close Window"
 msgstr "ウィンドウを閉じる"
 
-#: kwinbindings.cpp:32
+#: twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "ウィンドウを最大化"
 
-#: kwinbindings.cpp:34
+#: twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "ウィンドウを縦に最大化"
 
-#: kwinbindings.cpp:36
+#: twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "ウィンドウを横に最大化"
 
-#: kwinbindings.cpp:38
+#: twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "ウィンドウを最小化"
 
-#: kwinbindings.cpp:40
+#: twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "ウィンドウをシェード"
 
-#: kwinbindings.cpp:42
+#: twinbindings.cpp:42
 msgid "Move Window"
 msgstr "ウィンドウを移動"
 
-#: kwinbindings.cpp:44
+#: twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "ウィンドウをリサイズ"
 
-#: kwinbindings.cpp:46
+#: twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "ウィンドウを前面に"
 
-#: kwinbindings.cpp:48
+#: twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "ウィンドウを背面に"
 
-#: kwinbindings.cpp:50
+#: twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "ウィンドウを前面/背面に"
 
-#: kwinbindings.cpp:51
+#: twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "ウィンドウをフルスクリーンに"
 
-#: kwinbindings.cpp:53
+#: twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "ウィンドウの枠を隠す"
 
-#: kwinbindings.cpp:55
+#: twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "ウィンドウを常に他より上に"
 
-#: kwinbindings.cpp:57
+#: twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "ウィンドウを常に他より下に"
 
-#: kwinbindings.cpp:59
+#: twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "操作を要求しているウィンドウをアクティブに"
 
-#: kwinbindings.cpp:60
+#: twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "ウィンドウショートカットの設定"
 
-#: kwinbindings.cpp:61
+#: twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "ウィンドウを右寄せ"
 
-#: kwinbindings.cpp:63
+#: twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "ウィンドウを左寄せ"
 
-#: kwinbindings.cpp:65
+#: twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "ウィンドウを上寄せ"
 
-#: kwinbindings.cpp:67
+#: twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "ウィンドウを下寄せ"
 
-#: kwinbindings.cpp:69
+#: twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "ウィンドウを右へ伸ばす"
 
-#: kwinbindings.cpp:71
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "ウィンドウを下へ伸ばす"
 
-#: kwinbindings.cpp:73
+#: twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "ウィンドウを左へ縮める"
 
-#: kwinbindings.cpp:75
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "ウィンドウを上へ縮める"
 
-#: kwinbindings.cpp:78
+#: twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "ウィンドウをデスクトップへ移動"
 
-#: kwinbindings.cpp:79
+#: twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "ウィンドウをすべてのデスクトップに配置"
 
-#: kwinbindings.cpp:81
+#: twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "ウィンドウをデスクトップ 1 へ"
 
-#: kwinbindings.cpp:82
+#: twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "ウィンドウをデスクトップ 2 へ"
 
-#: kwinbindings.cpp:83
+#: twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "ウィンドウをデスクトップ 3 へ"
 
-#: kwinbindings.cpp:84
+#: twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "ウィンドウをデスクトップ 4 へ"
 
-#: kwinbindings.cpp:85
+#: twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "ウィンドウをデスクトップ 5 へ"
 
-#: kwinbindings.cpp:86
+#: twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "ウィンドウをデスクトップ 6 へ"
 
-#: kwinbindings.cpp:87
+#: twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "ウィンドウをデスクトップ 7 へ"
 
-#: kwinbindings.cpp:88
+#: twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "ウィンドウをデスクトップ 8 へ"
 
-#: kwinbindings.cpp:89
+#: twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "ウィンドウをデスクトップ 9 へ"
 
-#: kwinbindings.cpp:90
+#: twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "ウィンドウをデスクトップ 10 へ"
 
-#: kwinbindings.cpp:91
+#: twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "ウィンドウをデスクトップ 11 へ"
 
-#: kwinbindings.cpp:92
+#: twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "ウィンドウをデスクトップ 12 へ"
 
-#: kwinbindings.cpp:93
+#: twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "ウィンドウをデスクトップ 13 へ"
 
-#: kwinbindings.cpp:94
+#: twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "ウィンドウをデスクトップ 14 へ"
 
-#: kwinbindings.cpp:95
+#: twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "ウィンドウをデスクトップ 15 へ"
 
-#: kwinbindings.cpp:96
+#: twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "ウィンドウをデスクトップ 16 へ"
 
-#: kwinbindings.cpp:97
+#: twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "ウィンドウをデスクトップ 17 へ"
 
-#: kwinbindings.cpp:98
+#: twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "ウィンドウをデスクトップ 18 へ"
 
-#: kwinbindings.cpp:99
+#: twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "ウィンドウをデスクトップ 19 へ"
 
-#: kwinbindings.cpp:100
+#: twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "ウィンドウをデスクトップ 20 へ"
 
-#: kwinbindings.cpp:101
+#: twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "ウィンドウを次のデスクトップへ"
 
-#: kwinbindings.cpp:102
+#: twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "ウィンドウを前のデスクトップへ"
 
-#: kwinbindings.cpp:103
+#: twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "ウィンドウを一つ右のデスクトップへ"
 
-#: kwinbindings.cpp:104
+#: twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "ウィンドウを一つ左のデスクトップへ"
 
-#: kwinbindings.cpp:105
+#: twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "ウィンドウを一つ上のデスクトップへ"
 
-#: kwinbindings.cpp:106
+#: twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "ウィンドウを一つ下のデスクトップへ"
 
-#: kwinbindings.cpp:108
+#: twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "デスクトップの切り替え"
 
-#: kwinbindings.cpp:109
+#: twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "デスクトップ 1 に切り替え"
 
-#: kwinbindings.cpp:110
+#: twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "デスクトップ 2 に切り替え"
 
-#: kwinbindings.cpp:111
+#: twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "デスクトップ 3 に切り替え"
 
-#: kwinbindings.cpp:112
+#: twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "デスクトップ 4 に切り替え"
 
-#: kwinbindings.cpp:113
+#: twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "デスクトップ 5 に切り替え"
 
-#: kwinbindings.cpp:114
+#: twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "デスクトップ 6 に切り替え"
 
-#: kwinbindings.cpp:115
+#: twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "デスクトップ 7 に切り替え"
 
-#: kwinbindings.cpp:116
+#: twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "デスクトップ 8 に切り替え"
 
-#: kwinbindings.cpp:117
+#: twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "デスクトップ 9 に切り替え"
 
-#: kwinbindings.cpp:118
+#: twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "デスクトップ 10 に切り替え"
 
-#: kwinbindings.cpp:119
+#: twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "デスクトップ 11 に切り替え"
 
-#: kwinbindings.cpp:120
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "デスクトップ 12 に切り替え"
 
-#: kwinbindings.cpp:121
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "デスクトップ 13 に切り替え"
 
-#: kwinbindings.cpp:122
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "デスクトップ 14 に切り替え"
 
-#: kwinbindings.cpp:123
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "デスクトップ 15 に切り替え"
 
-#: kwinbindings.cpp:124
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "デスクトップ 16 に切り替え"
 
-#: kwinbindings.cpp:125
+#: twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "デスクトップ 17 に切り替え"
 
-#: kwinbindings.cpp:126
+#: twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "デスクトップ 18 に切り替え"
 
-#: kwinbindings.cpp:127
+#: twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "デスクトップ 19 に切り替え"
 
-#: kwinbindings.cpp:128
+#: twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "デスクトップ 20 に切り替え"
 
-#: kwinbindings.cpp:129
+#: twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "次のデスクトップに切り替え"
 
-#: kwinbindings.cpp:130
+#: twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "前のデスクトップに切り替え"
 
-#: kwinbindings.cpp:131
+#: twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "一つ右のデスクトップに切り替え"
 
-#: kwinbindings.cpp:132
+#: twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "一つ左のデスクトップに切り替え"
 
-#: kwinbindings.cpp:133
+#: twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "一つ上のデスクトップに切り替え"
 
-#: kwinbindings.cpp:134
+#: twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "一つ下のデスクトップに切り替え"
 
-#: kwinbindings.cpp:137
+#: twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "マウスエミュレーション"
 
-#: kwinbindings.cpp:138
+#: twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "ウィンドウを強制終了"
 
-#: kwinbindings.cpp:139
+#: twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "ウィンドウのスクリーンショット"
 
-#: kwinbindings.cpp:140
+#: twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "デスクトップのスクリーンショット"
 
-#: kwinbindings.cpp:145
+#: twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "グローバルショートカットをブロック"
 
 #: main.cpp:65
 msgid ""
-"kwin: it looks like there's already a window manager running. kwin not "
+"twin: it looks like there's already a window manager running. twin not "
 "started.\n"
 msgstr ""
-"kwin: 既にウィンドウマネージャが実行中のようです。kwin は起動しません。\n"
+"twin: 既にウィンドウマネージャが実行中のようです。twin は起動しません。\n"
 
 #: main.cpp:80
-msgid "kwin: failure during initialization; aborting"
-msgstr "kwin: 初期化失敗、起動を中止します"
+msgid "twin: failure during initialization; aborting"
+msgstr "twin: 初期化失敗、起動を中止します"
 
 #: main.cpp:101
 msgid ""
-"kwin: unable to claim manager selection, another wm running? (try using "
+"twin: unable to claim manager selection, another wm running? (try using "
 "--replace)\n"
 msgstr ""
-"kwin: ウィンドウマネージャになれませんでした。他のマネージャが実行中？ (\"--replace\" で試してみてください。)\n"
+"twin: ウィンドウマネージャになれませんでした。他のマネージャが実行中？ (\"--replace\" で試してみてください。)\n"
 
 #: main.cpp:182
 msgid "KDE window manager"
diff --git a/tde-i18n-ja/messages/kdebase/kwin_clients.po b/tde-i18n-ja/messages/kdebase/kwin_clients.po
index 6600124b4bf..2ae9ed73ea9 100644
--- a/tde-i18n-ja/messages/kdebase/kwin_clients.po
+++ b/tde-i18n-ja/messages/kdebase/kwin_clients.po
@@ -1,11 +1,11 @@
-# translation of kwin_clients.po to Japanese
+# translation of twin_clients.po to Japanese
 # Fumiaki Okushi <[email protected]>, 2004.
 # Fumiaki Okushi <[email protected]>, 2005.
 # Shinichi Tsunoda <[email protected]>, 2005.
 # Yukiko Bando <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_clients\n"
+"Project-Id-Version: twin_clients\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdebase/kwin_lib.po b/tde-i18n-ja/messages/kdebase/kwin_lib.po
index ef196f74aa0..5c49fa9e30f 100644
--- a/tde-i18n-ja/messages/kdebase/kwin_lib.po
+++ b/tde-i18n-ja/messages/kdebase/kwin_lib.po
@@ -1,10 +1,10 @@
-# translation of kwin_lib.po to Japanese
+# translation of twin_lib.po to Japanese
 # Shinichi Tsunoda <[email protected]>, 2005.
 # Yukiko Bando <[email protected]>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_lib\n"
+"Project-Id-Version: twin_lib\n"
 "POT-Creation-Date: 2005-10-08 02:42+0200\n"
 "PO-Revision-Date: 2006-10-15 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po b/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
index a1d818cf28c..6eec9649e53 100644
--- a/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
+++ b/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
@@ -1,11 +1,11 @@
-# translation of libkickermenu_kdeprint.po to Japanese
+# translation of libkickermenu_tdeprint.po to Japanese
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Noboru Sinohara <[email protected]>, 2002
 # Yukiko Bando <[email protected]>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libkickermenu_kdeprint\n"
+"Project-Id-Version: libkickermenu_tdeprint\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2006-05-03 18:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdeedu/Makefile.in b/tde-i18n-ja/messages/kdeedu/Makefile.in
index f4c42b11187..4f724f03de8 100644
--- a/tde-i18n-ja/messages/kdeedu/Makefile.in
+++ b/tde-i18n-ja/messages/kdeedu/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeedu
+subdir = messages/tdeedu
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = keduca.po kbruch.po kfile_kig.po ktouch.po kstars.po kmplot.po kverbos.po kwordquiz.po klettres.po khangman.po kig.po blinken.po kvoctrain.po kanagram.po kfile_drgeo.po libkdeedu.po kalzium.po klatin.po kturtle.po kpercentage.po kiten.po kgeography.po
-GMOFILES = keduca.gmo kbruch.gmo kfile_kig.gmo ktouch.gmo kstars.gmo kmplot.gmo kverbos.gmo kwordquiz.gmo klettres.gmo khangman.gmo kig.gmo blinken.gmo kvoctrain.gmo kanagram.gmo kfile_drgeo.gmo libkdeedu.gmo kalzium.gmo klatin.gmo kturtle.gmo kpercentage.gmo kiten.gmo kgeography.gmo
+POFILES = keduca.po kbruch.po kfile_kig.po ktouch.po kstars.po kmplot.po kverbos.po kwordquiz.po klettres.po khangman.po kig.po blinken.po kvoctrain.po kanagram.po kfile_drgeo.po libtdeedu.po kalzium.po klatin.po kturtle.po kpercentage.po kiten.po kgeography.po
+GMOFILES = keduca.gmo kbruch.gmo kfile_kig.gmo ktouch.gmo kstars.gmo kmplot.gmo kverbos.gmo kwordquiz.gmo klettres.gmo khangman.gmo kig.gmo blinken.gmo kvoctrain.gmo kanagram.gmo kfile_drgeo.gmo libtdeedu.gmo kalzium.gmo klatin.gmo kturtle.gmo kpercentage.gmo kiten.gmo kgeography.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeedu/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeedu/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeedu/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeedu/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeedu/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeedu/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeedu/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeedu/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeedu/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeedu/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=kverbos.po blinken.po libkdeedu.po keduca.po kturtle.po kbruch.po Makefile.in kgeography.po kstars.po kpercentage.po kwordquiz.po kalzium.po kmplot.po kig.po kiten.po kvoctrain.po ktouch.po kanagram.po kfile_kig.po klatin.po kfile_drgeo.po khangman.po Makefile.am klettres.po 
+KDE_DIST=kverbos.po blinken.po libtdeedu.po keduca.po kturtle.po kbruch.po Makefile.in kgeography.po kstars.po kpercentage.po kwordquiz.po kalzium.po kmplot.po kig.po kiten.po kvoctrain.po ktouch.po kanagram.po kfile_kig.po klatin.po kfile_drgeo.po khangman.po Makefile.am klettres.po 
 
 #>+ 67
 keduca.gmo: keduca.po
@@ -579,9 +579,9 @@ kanagram.gmo: kanagram.po
 kfile_drgeo.gmo: kfile_drgeo.po
 	rm -f kfile_drgeo.gmo; $(GMSGFMT) -o kfile_drgeo.gmo $(srcdir)/kfile_drgeo.po
 	test ! -f kfile_drgeo.gmo || touch kfile_drgeo.gmo
-libkdeedu.gmo: libkdeedu.po
-	rm -f libkdeedu.gmo; $(GMSGFMT) -o libkdeedu.gmo $(srcdir)/libkdeedu.po
-	test ! -f libkdeedu.gmo || touch libkdeedu.gmo
+libtdeedu.gmo: libtdeedu.po
+	rm -f libtdeedu.gmo; $(GMSGFMT) -o libtdeedu.gmo $(srcdir)/libtdeedu.po
+	test ! -f libtdeedu.gmo || touch libtdeedu.gmo
 kalzium.gmo: kalzium.po
 	rm -f kalzium.gmo; $(GMSGFMT) -o kalzium.gmo $(srcdir)/kalzium.po
 	test ! -f kalzium.gmo || touch kalzium.gmo
@@ -603,12 +603,12 @@ kgeography.gmo: kgeography.po
 
 #>+ 3
 clean-nls:
-	-rm -f  keduca.gmo kbruch.gmo kfile_kig.gmo ktouch.gmo kstars.gmo kmplot.gmo kverbos.gmo kwordquiz.gmo klettres.gmo khangman.gmo kig.gmo blinken.gmo kvoctrain.gmo kanagram.gmo kfile_drgeo.gmo libkdeedu.gmo kalzium.gmo klatin.gmo kturtle.gmo kpercentage.gmo kiten.gmo kgeography.gmo
+	-rm -f  keduca.gmo kbruch.gmo kfile_kig.gmo ktouch.gmo kstars.gmo kmplot.gmo kverbos.gmo kwordquiz.gmo klettres.gmo khangman.gmo kig.gmo blinken.gmo kvoctrain.gmo kanagram.gmo kfile_drgeo.gmo libtdeedu.gmo kalzium.gmo klatin.gmo kturtle.gmo kpercentage.gmo kiten.gmo kgeography.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in keduca kbruch kfile_kig ktouch kstars kmplot kverbos kwordquiz klettres khangman kig blinken kvoctrain kanagram kfile_drgeo libkdeedu kalzium klatin kturtle kpercentage kiten kgeography ; do \
+	@for base in keduca kbruch kfile_kig ktouch kstars kmplot kverbos kwordquiz klettres khangman kig blinken kvoctrain kanagram kfile_drgeo libtdeedu kalzium klatin kturtle kpercentage kiten kgeography ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -633,7 +633,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kvoctrain.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kanagram.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfile_drgeo.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkdeedu.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtdeedu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kalzium.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/klatin.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kturtle.mo
@@ -666,10 +666,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeedu/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeedu/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeedu/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeedu/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeedu/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeedu/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeedu/libkdeedu.po b/tde-i18n-ja/messages/kdeedu/libkdeedu.po
index d13bc4a5079..3b1f889e7cf 100644
--- a/tde-i18n-ja/messages/kdeedu/libkdeedu.po
+++ b/tde-i18n-ja/messages/kdeedu/libkdeedu.po
@@ -1,10 +1,10 @@
-# translation of libkdeedu.po to Japanese
+# translation of libtdeedu.po to Japanese
 #
 # KIMIZUKA Tomokazu <[email protected]>, 2005.
 # Fumiaki Okushi <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libkdeedu\n"
+"Project-Id-Version: libtdeedu\n"
 "POT-Creation-Date: 2007-02-14 02:46+0100\n"
 "PO-Revision-Date: 2006-10-14 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -307,14 +307,14 @@ msgstr "年を選択"
 msgid "Select the current day"
 msgstr "現在日を選択"
 
-#: kdeeduui/kdeeduglossary.cpp:35 kdeeduui/kdeeduglossary.cpp:166
+#: tdeeduui/tdeeduglossary.cpp:35 tdeeduui/tdeeduglossary.cpp:166
 msgid "Glossary"
 msgstr "用語集"
 
-#: kdeeduui/kdeeduglossary.cpp:185
+#: tdeeduui/tdeeduglossary.cpp:185
 msgid "Search:"
 msgstr "検索:"
 
-#: kdeeduui/kdeeduglossary.cpp:390
+#: tdeeduui/tdeeduglossary.cpp:390
 msgid "References"
 msgstr "リファレンス"
diff --git a/tde-i18n-ja/messages/kdegames/Makefile.in b/tde-i18n-ja/messages/kdegames/Makefile.in
index b6220ac765f..738e0087c0b 100644
--- a/tde-i18n-ja/messages/kdegames/Makefile.in
+++ b/tde-i18n-ja/messages/kdegames/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdegames
+subdir = messages/tdegames
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = ksirtet.po kbounce.po kbackgammon.po ktron.po klines.po ksmiletris.po kfouleggs.po ksokoban.po katomic.po kmines.po lskat.po konquest.po kshisen.po kmahjongg.po knetwalk.po kjumpingcube.po libksirtet.po kpat.po ksnake.po klickety.po libkdegames.po kolf.po kbattleship.po kspaceduel.po kenolaba.po kasteroids.po kwin4.po kblackbox.po kpoker.po atlantik.po ksame.po kgoldrunner.po ktuberling.po kreversi.po
-GMOFILES = ksirtet.gmo kbounce.gmo kbackgammon.gmo ktron.gmo klines.gmo ksmiletris.gmo kfouleggs.gmo ksokoban.gmo katomic.gmo kmines.gmo lskat.gmo konquest.gmo kshisen.gmo kmahjongg.gmo knetwalk.gmo kjumpingcube.gmo libksirtet.gmo kpat.gmo ksnake.gmo klickety.gmo libkdegames.gmo kolf.gmo kbattleship.gmo kspaceduel.gmo kenolaba.gmo kasteroids.gmo kwin4.gmo kblackbox.gmo kpoker.gmo atlantik.gmo ksame.gmo kgoldrunner.gmo ktuberling.gmo kreversi.gmo
+POFILES = ksirtet.po kbounce.po kbackgammon.po ktron.po klines.po ksmiletris.po kfouleggs.po ksokoban.po katomic.po kmines.po lskat.po konquest.po kshisen.po kmahjongg.po knetwalk.po kjumpingcube.po libksirtet.po kpat.po ksnake.po klickety.po libtdegames.po kolf.po kbattleship.po kspaceduel.po kenolaba.po kasteroids.po twin4.po kblackbox.po kpoker.po atlantik.po ksame.po kgoldrunner.po ktuberling.po kreversi.po
+GMOFILES = ksirtet.gmo kbounce.gmo kbackgammon.gmo ktron.gmo klines.gmo ksmiletris.gmo kfouleggs.gmo ksokoban.gmo katomic.gmo kmines.gmo lskat.gmo konquest.gmo kshisen.gmo kmahjongg.gmo knetwalk.gmo kjumpingcube.gmo libksirtet.gmo kpat.gmo ksnake.gmo klickety.gmo libtdegames.gmo kolf.gmo kbattleship.gmo kspaceduel.gmo kenolaba.gmo kasteroids.gmo twin4.gmo kblackbox.gmo kpoker.gmo atlantik.gmo ksame.gmo kgoldrunner.gmo ktuberling.gmo kreversi.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegames/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegames/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdegames/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdegames/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegames/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegames/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdegames/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdegames/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdegames/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdegames/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=ksmiletris.po kmahjongg.po kspaceduel.po kpoker.po kolf.po kbounce.po kpat.po ksokoban.po klickety.po kmines.po ksame.po kblackbox.po katomic.po kasteroids.po kenolaba.po kreversi.po Makefile.in kfouleggs.po klines.po ktron.po atlantik.po ksirtet.po kgoldrunner.po libkdegames.po konquest.po lskat.po kbackgammon.po kwin4.po kshisen.po kjumpingcube.po kbattleship.po libksirtet.po knetwalk.po ktuberling.po ksnake.po Makefile.am 
+KDE_DIST=ksmiletris.po kmahjongg.po kspaceduel.po kpoker.po kolf.po kbounce.po kpat.po ksokoban.po klickety.po kmines.po ksame.po kblackbox.po katomic.po kasteroids.po kenolaba.po kreversi.po Makefile.in kfouleggs.po klines.po ktron.po atlantik.po ksirtet.po kgoldrunner.po libtdegames.po konquest.po lskat.po kbackgammon.po twin4.po kshisen.po kjumpingcube.po kbattleship.po libksirtet.po knetwalk.po ktuberling.po ksnake.po Makefile.am 
 
 #>+ 103
 ksirtet.gmo: ksirtet.po
@@ -594,9 +594,9 @@ ksnake.gmo: ksnake.po
 klickety.gmo: klickety.po
 	rm -f klickety.gmo; $(GMSGFMT) -o klickety.gmo $(srcdir)/klickety.po
 	test ! -f klickety.gmo || touch klickety.gmo
-libkdegames.gmo: libkdegames.po
-	rm -f libkdegames.gmo; $(GMSGFMT) -o libkdegames.gmo $(srcdir)/libkdegames.po
-	test ! -f libkdegames.gmo || touch libkdegames.gmo
+libtdegames.gmo: libtdegames.po
+	rm -f libtdegames.gmo; $(GMSGFMT) -o libtdegames.gmo $(srcdir)/libtdegames.po
+	test ! -f libtdegames.gmo || touch libtdegames.gmo
 kolf.gmo: kolf.po
 	rm -f kolf.gmo; $(GMSGFMT) -o kolf.gmo $(srcdir)/kolf.po
 	test ! -f kolf.gmo || touch kolf.gmo
@@ -612,9 +612,9 @@ kenolaba.gmo: kenolaba.po
 kasteroids.gmo: kasteroids.po
 	rm -f kasteroids.gmo; $(GMSGFMT) -o kasteroids.gmo $(srcdir)/kasteroids.po
 	test ! -f kasteroids.gmo || touch kasteroids.gmo
-kwin4.gmo: kwin4.po
-	rm -f kwin4.gmo; $(GMSGFMT) -o kwin4.gmo $(srcdir)/kwin4.po
-	test ! -f kwin4.gmo || touch kwin4.gmo
+twin4.gmo: twin4.po
+	rm -f twin4.gmo; $(GMSGFMT) -o twin4.gmo $(srcdir)/twin4.po
+	test ! -f twin4.gmo || touch twin4.gmo
 kblackbox.gmo: kblackbox.po
 	rm -f kblackbox.gmo; $(GMSGFMT) -o kblackbox.gmo $(srcdir)/kblackbox.po
 	test ! -f kblackbox.gmo || touch kblackbox.gmo
@@ -639,12 +639,12 @@ kreversi.gmo: kreversi.po
 
 #>+ 3
 clean-nls:
-	-rm -f  ksirtet.gmo kbounce.gmo kbackgammon.gmo ktron.gmo klines.gmo ksmiletris.gmo kfouleggs.gmo ksokoban.gmo katomic.gmo kmines.gmo lskat.gmo konquest.gmo kshisen.gmo kmahjongg.gmo knetwalk.gmo kjumpingcube.gmo libksirtet.gmo kpat.gmo ksnake.gmo klickety.gmo libkdegames.gmo kolf.gmo kbattleship.gmo kspaceduel.gmo kenolaba.gmo kasteroids.gmo kwin4.gmo kblackbox.gmo kpoker.gmo atlantik.gmo ksame.gmo kgoldrunner.gmo ktuberling.gmo kreversi.gmo
+	-rm -f  ksirtet.gmo kbounce.gmo kbackgammon.gmo ktron.gmo klines.gmo ksmiletris.gmo kfouleggs.gmo ksokoban.gmo katomic.gmo kmines.gmo lskat.gmo konquest.gmo kshisen.gmo kmahjongg.gmo knetwalk.gmo kjumpingcube.gmo libksirtet.gmo kpat.gmo ksnake.gmo klickety.gmo libtdegames.gmo kolf.gmo kbattleship.gmo kspaceduel.gmo kenolaba.gmo kasteroids.gmo twin4.gmo kblackbox.gmo kpoker.gmo atlantik.gmo ksame.gmo kgoldrunner.gmo ktuberling.gmo kreversi.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in ksirtet kbounce kbackgammon ktron klines ksmiletris kfouleggs ksokoban katomic kmines lskat konquest kshisen kmahjongg knetwalk kjumpingcube libksirtet kpat ksnake klickety libkdegames kolf kbattleship kspaceduel kenolaba kasteroids kwin4 kblackbox kpoker atlantik ksame kgoldrunner ktuberling kreversi ; do \
+	@for base in ksirtet kbounce kbackgammon ktron klines ksmiletris kfouleggs ksokoban katomic kmines lskat konquest kshisen kmahjongg knetwalk kjumpingcube libksirtet kpat ksnake klickety libtdegames kolf kbattleship kspaceduel kenolaba kasteroids twin4 kblackbox kpoker atlantik ksame kgoldrunner ktuberling kreversi ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -674,13 +674,13 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpat.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksnake.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/klickety.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkdegames.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtdegames.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kolf.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kbattleship.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kspaceduel.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kenolaba.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kasteroids.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin4.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin4.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kblackbox.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpoker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/atlantik.mo
@@ -714,10 +714,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegames/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegames/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdegames/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdegames/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdegames/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdegames/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdegames/kwin4.po b/tde-i18n-ja/messages/kdegames/kwin4.po
index 233b1794bfc..fa5582bb10b 100644
--- a/tde-i18n-ja/messages/kdegames/kwin4.po
+++ b/tde-i18n-ja/messages/kdegames/kwin4.po
@@ -1,11 +1,11 @@
-# translation of kwin4.po to Japanese
+# translation of twin4.po to Japanese
 # Taiki Komoda <[email protected]>, 2002.
 # Takuro Ashie <[email protected]>, 2004.
 # Kurose Shushi <[email protected]>, 2004.
 # Fumiaki Okushi <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin4\n"
+"Project-Id-Version: twin4\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2007-04-14 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -27,175 +27,175 @@ msgid ""
 "Your emails"
 msgstr "[email protected],[email protected],[email protected]"
 
-#: kwin4.cpp:67
+#: twin4.cpp:67
 msgid "Chat Dlg"
 msgstr "チャットダイアログ"
 
-#: kwin4.cpp:73
+#: twin4.cpp:73
 msgid "Chat"
 msgstr "チャット"
 
-#: kwin4.cpp:79
+#: twin4.cpp:79
 msgid "Configure..."
 msgstr "設定..."
 
-#: kwin4.cpp:192
+#: twin4.cpp:192
 msgid "Start a new game"
 msgstr "新規ゲームを開始する"
 
-#: kwin4.cpp:195
+#: twin4.cpp:195
 msgid "Open a saved game..."
 msgstr "保存されたゲームを開く..."
 
-#: kwin4.cpp:198
+#: twin4.cpp:198
 msgid "Save a game..."
 msgstr "ゲームを保存..."
 
-#: kwin4.cpp:201
+#: twin4.cpp:201
 msgid "Ending the current game..."
 msgstr "現在のゲームを終了..."
 
-#: kwin4.cpp:202
+#: twin4.cpp:202
 msgid "Aborts a currently played game. No winner will be declared."
 msgstr "現在のゲームを中止します。勝者なしになります。"
 
-#: kwin4.cpp:204
+#: twin4.cpp:204
 msgid "&Network Configuration..."
 msgstr "ネットワーク設定(&N)..."
 
-#: kwin4.cpp:207
+#: twin4.cpp:207
 msgid "Network Chat..."
 msgstr "ネットワークチャット..."
 
-#: kwin4.cpp:211
+#: twin4.cpp:211
 msgid "Debug KGame"
 msgstr "KGame をデバッグ"
 
-#: kwin4.cpp:214
+#: twin4.cpp:214
 msgid "&Show Statistics"
 msgstr "統計を表示(&S)"
 
-#: kwin4.cpp:216
+#: twin4.cpp:216
 msgid "Show statistics."
 msgstr "統計を表示"
 
-#: kwin4.cpp:219
+#: twin4.cpp:219
 msgid "Shows a hint on how to move."
 msgstr "移動のヒントを表示"
 
-#: kwin4.cpp:222
+#: twin4.cpp:222
 msgid "Quits the program."
 msgstr "プログラムを終了"
 
-#: kwin4.cpp:225
+#: twin4.cpp:225
 msgid "Undo last move."
 msgstr "直前の移動を取り消し"
 
-#: kwin4.cpp:228
+#: twin4.cpp:228
 msgid "Redo last move."
 msgstr "直前の移動をやり直し"
 
-#: kwin4.cpp:242 kwin4.cpp:252
+#: twin4.cpp:242 twin4.cpp:252
 msgid "Ready"
 msgstr "準備完了"
 
-#: kwin4.cpp:251
+#: twin4.cpp:251
 msgid "This leaves space for the mover"
 msgstr "これはプレイヤーにスペースを残します"
 
-#: kwin4.cpp:254
+#: twin4.cpp:254
 msgid "(c) Martin Heni   "
 msgstr "(c) Martin Heni   "
 
-#: kwin4.cpp:255
+#: twin4.cpp:255
 msgid "Welcome to KWin4"
 msgstr "KWin4 へようこそ"
 
-#: kwin4.cpp:457
+#: twin4.cpp:457
 msgid "No game  "
 msgstr "ゲームなし"
 
-#: kwin4.cpp:459
+#: twin4.cpp:459
 msgid " - Yellow "
 msgstr " - 黄 "
 
-#: kwin4.cpp:461
+#: twin4.cpp:461
 msgid " - Red "
 msgstr " - 赤 "
 
-#: kwin4.cpp:463
+#: twin4.cpp:463
 msgid "Nobody  "
 msgstr "Nobody  "
 
-#: kwin4.cpp:482
+#: twin4.cpp:482
 msgid ""
 "The network game ended!\n"
 msgstr ""
 "ネットワークゲームは終了しました!\n"
 
-#: kwin4.cpp:493
+#: twin4.cpp:493
 msgid "Game running..."
 msgstr "ゲーム続行中..."
 
-#: kwin4.cpp:504
+#: twin4.cpp:504
 msgid "The game is drawn. Please restart next round."
 msgstr "引き分けです。次のラウンドを開始してください。"
 
-#: kwin4.cpp:512
+#: twin4.cpp:512
 msgid "%1 won the game. Please restart next round."
 msgstr "%1 の勝ちです。次のラウンドを開始してください。"
 
-#: kwin4.cpp:518
+#: twin4.cpp:518
 msgid " Game aborted. Please restart next round."
 msgstr " ゲームは中止されました。次のラウンドを開始してください。"
 
-#: kwin4.cpp:536
+#: twin4.cpp:536
 msgid "Network Configuration"
 msgstr "ネットワーク設定"
 
-#: kwin4.cpp:548
+#: twin4.cpp:548
 msgid "Yellow should be played by remote"
 msgstr "黄はリモートプレイヤー"
 
-#: kwin4.cpp:549
+#: twin4.cpp:549
 msgid "Red should be played by remote"
 msgstr "赤はリモートプレイヤー"
 
-#: kwin4.cpp:621
+#: twin4.cpp:621
 msgid "General"
 msgstr "一般"
 
-#: kwin4view.cpp:350
+#: twin4view.cpp:350
 msgid ""
 "_: 1. intro line, welcome to win4\n"
 "Welcome"
 msgstr "ようこそ"
 
-#: kwin4view.cpp:356
+#: twin4view.cpp:356
 msgid ""
 "_: 2. intro line, welcome to win4\n"
 "to"
 msgstr "KWin4 へ "
 
-#: kwin4view.cpp:362
+#: twin4view.cpp:362
 msgid ""
 "_: 3. intro line, welcome to win4\n"
 "KWin4"
 msgstr " "
 
-#: kwin4view.cpp:606
+#: twin4view.cpp:606
 msgid "Hold on... the other player has not been yet..."
 msgstr "待って、相手が進んでません..."
 
-#: kwin4view.cpp:607
+#: twin4view.cpp:607
 msgid "Hold your horses..."
 msgstr "どうどう..."
 
-#: kwin4view.cpp:608
+#: twin4view.cpp:608
 msgid "Ah ah ah... only one go at a time..."
 msgstr "一度に一つしか進めません..."
 
-#: kwin4view.cpp:609
+#: twin4view.cpp:609
 msgid "Please wait... it is not your turn."
 msgstr "あなたの番ではありません。お待ちください..."
 
@@ -393,31 +393,31 @@ msgstr "負"
 msgid "Bk"
 msgstr "中止"
 
-#. i18n: file kwin4.kcfg line 9
+#. i18n: file twin4.kcfg line 9
 #: rc.cpp:117
 #, no-c-format
 msgid "Network connection port"
 msgstr "ネットワーク接続ポート"
 
-#. i18n: file kwin4.kcfg line 13
+#. i18n: file twin4.kcfg line 13
 #: rc.cpp:120
 #, no-c-format
 msgid "Game name"
 msgstr "ゲーム名"
 
-#. i18n: file kwin4.kcfg line 16
+#. i18n: file twin4.kcfg line 16
 #: rc.cpp:123
 #, no-c-format
 msgid "Network connection host"
 msgstr "ネットワーク接続ホスト"
 
-#. i18n: file kwin4.kcfg line 27
+#. i18n: file twin4.kcfg line 27
 #: rc.cpp:129
 #, no-c-format
 msgid "Player 1 name"
 msgstr "プレイヤー名 1"
 
-#. i18n: file kwin4.kcfg line 31
+#. i18n: file twin4.kcfg line 31
 #: rc.cpp:132
 #, no-c-format
 msgid "Player 2 name"
diff --git a/tde-i18n-ja/messages/kdegames/libkdegames.po b/tde-i18n-ja/messages/kdegames/libkdegames.po
index ce4badd58ce..27bcf485e7d 100644
--- a/tde-i18n-ja/messages/kdegames/libkdegames.po
+++ b/tde-i18n-ja/messages/kdegames/libkdegames.po
@@ -1,4 +1,4 @@
-# translation of libkdegames.po to Japanese
+# translation of libtdegames.po to Japanese
 # Taiki Komoda <[email protected]>, 2002.
 # Takuro Ashie <[email protected]>, 2004.
 # Toyohiro Asukai <[email protected]>, 2004.
@@ -8,7 +8,7 @@
 # Yukiko Bando <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libkdegames\n"
+"Project-Id-Version: libtdegames\n"
 "POT-Creation-Date: 2006-12-21 02:39+0100\n"
 "PO-Revision-Date: 2006-12-22 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdegraphics/Makefile.in b/tde-i18n-ja/messages/kdegraphics/Makefile.in
index 24840034ed4..a2097e18a33 100644
--- a/tde-i18n-ja/messages/kdegraphics/Makefile.in
+++ b/tde-i18n-ja/messages/kdegraphics/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdegraphics
+subdir = messages/tdegraphics
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdegraphics/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdegraphics/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -778,10 +778,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdegraphics/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdegraphics/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdegraphics/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdegraphics/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdelibs/Makefile.in b/tde-i18n-ja/messages/kdelibs/Makefile.in
index b78fb39ad52..58ce3c741d1 100644
--- a/tde-i18n-ja/messages/kdelibs/Makefile.in
+++ b/tde-i18n-ja/messages/kdelibs/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdelibs
+subdir = messages/tdelibs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = libkscreensaver.po kabcformat_binary.po kio_help.po ktexteditor_kdatatool.po kdelibs_colors.po kabc_dir.po kabc_file.po kstyle_highcontrast_config.po knotify.po ktexteditor_docwordcompletion.po kdeprint.po kstyle_plastik_config.po kdelibs.po ktexteditor_insertfile.po kioexec.po kcmshell.po kfileaudiopreview.po kabc_ldapkio.po ktexteditor_isearch.po kmcop.po katepart.po cupsdconf.po ktexteditor_autobookmarker.po kabc_sql.po kio.po ppdtranslations.po timezones.po kabc_net.po
-GMOFILES = libkscreensaver.gmo kabcformat_binary.gmo kio_help.gmo ktexteditor_kdatatool.gmo kdelibs_colors.gmo kabc_dir.gmo kabc_file.gmo kstyle_highcontrast_config.gmo knotify.gmo ktexteditor_docwordcompletion.gmo kdeprint.gmo kstyle_plastik_config.gmo kdelibs.gmo ktexteditor_insertfile.gmo kioexec.gmo kcmshell.gmo kfileaudiopreview.gmo kabc_ldapkio.gmo ktexteditor_isearch.gmo kmcop.gmo katepart.gmo cupsdconf.gmo ktexteditor_autobookmarker.gmo kabc_sql.gmo kio.gmo ppdtranslations.gmo timezones.gmo kabc_net.gmo
+POFILES = libkscreensaver.po kabcformat_binary.po kio_help.po ktexteditor_kdatatool.po tdelibs_colors.po kabc_dir.po kabc_file.po kstyle_highcontrast_config.po knotify.po ktexteditor_docwordcompletion.po tdeprint.po kstyle_plastik_config.po tdelibs.po ktexteditor_insertfile.po kioexec.po kcmshell.po kfileaudiopreview.po kabc_ldapkio.po ktexteditor_isearch.po kmcop.po katepart.po cupsdconf.po ktexteditor_autobookmarker.po kabc_sql.po kio.po ppdtranslations.po timezones.po kabc_net.po
+GMOFILES = libkscreensaver.gmo kabcformat_binary.gmo kio_help.gmo ktexteditor_kdatatool.gmo tdelibs_colors.gmo kabc_dir.gmo kabc_file.gmo kstyle_highcontrast_config.gmo knotify.gmo ktexteditor_docwordcompletion.gmo tdeprint.gmo kstyle_plastik_config.gmo tdelibs.gmo ktexteditor_insertfile.gmo kioexec.gmo kcmshell.gmo kfileaudiopreview.gmo kabc_ldapkio.gmo ktexteditor_isearch.gmo kmcop.gmo katepart.gmo cupsdconf.gmo ktexteditor_autobookmarker.gmo kabc_sql.gmo kio.gmo ppdtranslations.gmo timezones.gmo kabc_net.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdelibs/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdelibs/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdelibs/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdelibs/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdelibs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdelibs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdelibs/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdelibs/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdelibs/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdelibs/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=kdelibs.po ktexteditor_kdatatool.po ktexteditor_autobookmarker.po cupsdconf.po kmcop.po katepart.po Makefile.in ktexteditor_docwordcompletion.po kabc_ldapkio.po kstyle_highcontrast_config.po kabc_sql.po kabc_file.po kio_help.po kabc_dir.po kcmshell.po kdelibs_colors.po kabcformat_binary.po kio.po kdeprint.po kabc_net.po kioexec.po timezones.po ktexteditor_isearch.po knotify.po ktexteditor_insertfile.po kfileaudiopreview.po kstyle_plastik_config.po libkscreensaver.po ppdtranslations.po Makefile.am 
+KDE_DIST=tdelibs.po ktexteditor_kdatatool.po ktexteditor_autobookmarker.po cupsdconf.po kmcop.po katepart.po Makefile.in ktexteditor_docwordcompletion.po kabc_ldapkio.po kstyle_highcontrast_config.po kabc_sql.po kabc_file.po kio_help.po kabc_dir.po kcmshell.po tdelibs_colors.po kabcformat_binary.po kio.po tdeprint.po kabc_net.po kioexec.po timezones.po ktexteditor_isearch.po knotify.po ktexteditor_insertfile.po kfileaudiopreview.po kstyle_plastik_config.po libkscreensaver.po ppdtranslations.po Makefile.am 
 
 #>+ 85
 libkscreensaver.gmo: libkscreensaver.po
@@ -546,9 +546,9 @@ kio_help.gmo: kio_help.po
 ktexteditor_kdatatool.gmo: ktexteditor_kdatatool.po
 	rm -f ktexteditor_kdatatool.gmo; $(GMSGFMT) -o ktexteditor_kdatatool.gmo $(srcdir)/ktexteditor_kdatatool.po
 	test ! -f ktexteditor_kdatatool.gmo || touch ktexteditor_kdatatool.gmo
-kdelibs_colors.gmo: kdelibs_colors.po
-	rm -f kdelibs_colors.gmo; $(GMSGFMT) -o kdelibs_colors.gmo $(srcdir)/kdelibs_colors.po
-	test ! -f kdelibs_colors.gmo || touch kdelibs_colors.gmo
+tdelibs_colors.gmo: tdelibs_colors.po
+	rm -f tdelibs_colors.gmo; $(GMSGFMT) -o tdelibs_colors.gmo $(srcdir)/tdelibs_colors.po
+	test ! -f tdelibs_colors.gmo || touch tdelibs_colors.gmo
 kabc_dir.gmo: kabc_dir.po
 	rm -f kabc_dir.gmo; $(GMSGFMT) -o kabc_dir.gmo $(srcdir)/kabc_dir.po
 	test ! -f kabc_dir.gmo || touch kabc_dir.gmo
@@ -564,15 +564,15 @@ knotify.gmo: knotify.po
 ktexteditor_docwordcompletion.gmo: ktexteditor_docwordcompletion.po
 	rm -f ktexteditor_docwordcompletion.gmo; $(GMSGFMT) -o ktexteditor_docwordcompletion.gmo $(srcdir)/ktexteditor_docwordcompletion.po
 	test ! -f ktexteditor_docwordcompletion.gmo || touch ktexteditor_docwordcompletion.gmo
-kdeprint.gmo: kdeprint.po
-	rm -f kdeprint.gmo; $(GMSGFMT) -o kdeprint.gmo $(srcdir)/kdeprint.po
-	test ! -f kdeprint.gmo || touch kdeprint.gmo
+tdeprint.gmo: tdeprint.po
+	rm -f tdeprint.gmo; $(GMSGFMT) -o tdeprint.gmo $(srcdir)/tdeprint.po
+	test ! -f tdeprint.gmo || touch tdeprint.gmo
 kstyle_plastik_config.gmo: kstyle_plastik_config.po
 	rm -f kstyle_plastik_config.gmo; $(GMSGFMT) -o kstyle_plastik_config.gmo $(srcdir)/kstyle_plastik_config.po
 	test ! -f kstyle_plastik_config.gmo || touch kstyle_plastik_config.gmo
-kdelibs.gmo: kdelibs.po
-	rm -f kdelibs.gmo; $(GMSGFMT) -o kdelibs.gmo $(srcdir)/kdelibs.po
-	test ! -f kdelibs.gmo || touch kdelibs.gmo
+tdelibs.gmo: tdelibs.po
+	rm -f tdelibs.gmo; $(GMSGFMT) -o tdelibs.gmo $(srcdir)/tdelibs.po
+	test ! -f tdelibs.gmo || touch tdelibs.gmo
 ktexteditor_insertfile.gmo: ktexteditor_insertfile.po
 	rm -f ktexteditor_insertfile.gmo; $(GMSGFMT) -o ktexteditor_insertfile.gmo $(srcdir)/ktexteditor_insertfile.po
 	test ! -f ktexteditor_insertfile.gmo || touch ktexteditor_insertfile.gmo
@@ -621,12 +621,12 @@ kabc_net.gmo: kabc_net.po
 
 #>+ 3
 clean-nls:
-	-rm -f  libkscreensaver.gmo kabcformat_binary.gmo kio_help.gmo ktexteditor_kdatatool.gmo kdelibs_colors.gmo kabc_dir.gmo kabc_file.gmo kstyle_highcontrast_config.gmo knotify.gmo ktexteditor_docwordcompletion.gmo kdeprint.gmo kstyle_plastik_config.gmo kdelibs.gmo ktexteditor_insertfile.gmo kioexec.gmo kcmshell.gmo kfileaudiopreview.gmo kabc_ldapkio.gmo ktexteditor_isearch.gmo kmcop.gmo katepart.gmo cupsdconf.gmo ktexteditor_autobookmarker.gmo kabc_sql.gmo kio.gmo ppdtranslations.gmo timezones.gmo kabc_net.gmo
+	-rm -f  libkscreensaver.gmo kabcformat_binary.gmo kio_help.gmo ktexteditor_kdatatool.gmo tdelibs_colors.gmo kabc_dir.gmo kabc_file.gmo kstyle_highcontrast_config.gmo knotify.gmo ktexteditor_docwordcompletion.gmo tdeprint.gmo kstyle_plastik_config.gmo tdelibs.gmo ktexteditor_insertfile.gmo kioexec.gmo kcmshell.gmo kfileaudiopreview.gmo kabc_ldapkio.gmo ktexteditor_isearch.gmo kmcop.gmo katepart.gmo cupsdconf.gmo ktexteditor_autobookmarker.gmo kabc_sql.gmo kio.gmo ppdtranslations.gmo timezones.gmo kabc_net.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in libkscreensaver kabcformat_binary kio_help ktexteditor_kdatatool kdelibs_colors kabc_dir kabc_file kstyle_highcontrast_config knotify ktexteditor_docwordcompletion kdeprint kstyle_plastik_config kdelibs ktexteditor_insertfile kioexec kcmshell kfileaudiopreview kabc_ldapkio ktexteditor_isearch kmcop katepart cupsdconf ktexteditor_autobookmarker kabc_sql kio ppdtranslations timezones kabc_net ; do \
+	@for base in libkscreensaver kabcformat_binary kio_help ktexteditor_kdatatool tdelibs_colors kabc_dir kabc_file kstyle_highcontrast_config knotify ktexteditor_docwordcompletion tdeprint kstyle_plastik_config tdelibs ktexteditor_insertfile kioexec kcmshell kfileaudiopreview kabc_ldapkio ktexteditor_isearch kmcop katepart cupsdconf ktexteditor_autobookmarker kabc_sql kio ppdtranslations timezones kabc_net ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -640,15 +640,15 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kabcformat_binary.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_help.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktexteditor_kdatatool.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdelibs_colors.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdelibs_colors.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kabc_dir.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kabc_file.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_highcontrast_config.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/knotify.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktexteditor_docwordcompletion.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprint.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_plastik_config.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdelibs.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdelibs.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktexteditor_insertfile.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kioexec.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmshell.mo
@@ -690,10 +690,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdelibs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdelibs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdelibs/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdelibs/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdelibs/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdelibs/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdelibs/kdelibs.po b/tde-i18n-ja/messages/kdelibs/kdelibs.po
index eccf3e8a2f0..4a8a9e43b92 100644
--- a/tde-i18n-ja/messages/kdelibs/kdelibs.po
+++ b/tde-i18n-ja/messages/kdelibs/kdelibs.po
@@ -1,4 +1,4 @@
-# translation of kdelibs.po to Japanese
+# translation of tdelibs.po to Japanese
 # Taiki Komoda <[email protected]>, 2002, 2004, 2006.
 # Noboru Sinohara <[email protected]>, 2004.
 # Toyohiro Asukai <[email protected]>, 2004.
@@ -10,7 +10,7 @@
 # Fumiaki Okushi <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdelibs\n"
+"Project-Id-Version: tdelibs\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2007-08-28 21:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -44,50 +44,50 @@ msgstr ""
 msgid "&Certificate"
 msgstr "証明書(&C)"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 58
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 58
 #: rc.cpp:12
 #, no-c-format
 msgid "Alternate shortcut:"
 msgstr "第二ショートカット:"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 69
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 69
 #: rc.cpp:15
 #, no-c-format
 msgid "Primary shortcut:"
 msgstr "第一ショートカット:"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 155
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 155
 #: rc.cpp:18
 #, no-c-format
 msgid ""
 "The currently set shortcut or the shortcut you are entering will show up here."
 msgstr "設定済み、または入力中のショートカットがここに表示されます。"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 182
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 182
 #: rc.cpp:21 rc.cpp:27 rc.cpp:84
 #, no-c-format
 msgid "x"
 msgstr "x"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 188
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 188
 #: rc.cpp:24 rc.cpp:30 rc.cpp:87
 #, no-c-format
 msgid "Clear shortcut"
 msgstr "ショートカットをクリア"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 213
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 213
 #: rc.cpp:33
 #, no-c-format
 msgid "Multi-key mode"
 msgstr "順次入力モード"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 216
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 216
 #: rc.cpp:36
 #, no-c-format
 msgid "Enable the entry of multi-key shortcuts"
 msgstr "順次入力ショートカットの設定を可能にします"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 219
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 219
 #: rc.cpp:39
 #, no-c-format
 msgid ""
@@ -99,25 +99,25 @@ msgstr ""
 "[Ctrl+F,B] (Ctrl キーと F を同時に押してから B を押す) でイタリック体フォントにしたり、[Ctrl+F,U] "
 "で下線付きフォントにするという使い方ができます。"
 
-#. i18n: file ./kdeui/ui_standards.rc line 4
+#. i18n: file ./tdeui/ui_standards.rc line 4
 #: common_texts.cpp:77 rc.cpp:42 rc.cpp:262
 #, no-c-format
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 33
+#. i18n: file ./tdeui/ui_standards.rc line 33
 #: common_texts.cpp:131 rc.cpp:45
 #, no-c-format
 msgid "&Game"
 msgstr "ゲーム(&G)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 57
+#. i18n: file ./tdeui/ui_standards.rc line 57
 #: common_texts.cpp:81 rc.cpp:48 rc.cpp:229 rc.cpp:265
 #, no-c-format
 msgid "&Edit"
 msgstr "編集(&E)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 80
+#. i18n: file ./tdeui/ui_standards.rc line 80
 #: rc.cpp:51
 #, no-c-format
 msgid ""
@@ -125,61 +125,61 @@ msgid ""
 "&Move"
 msgstr "移動(&M)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 97
+#. i18n: file ./tdeui/ui_standards.rc line 97
 #: common_texts.cpp:84 rc.cpp:54 rc.cpp:268
 #, no-c-format
 msgid "&View"
 msgstr "表示(&V)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 112
+#. i18n: file ./tdeui/ui_standards.rc line 112
 #: rc.cpp:57 rc.cpp:60
 #, no-c-format
 msgid "&Go"
 msgstr "移動(&G)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 133
+#. i18n: file ./tdeui/ui_standards.rc line 133
 #: common_texts.cpp:182 rc.cpp:63
 #, no-c-format
 msgid "&Bookmarks"
 msgstr "ブックマーク(&B)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 139
+#. i18n: file ./tdeui/ui_standards.rc line 139
 #: common_texts.cpp:185 rc.cpp:66
 #, no-c-format
 msgid "&Tools"
 msgstr "ツール(&T)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 143
+#. i18n: file ./tdeui/ui_standards.rc line 143
 #: common_texts.cpp:192 rc.cpp:69
 #, no-c-format
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#. i18n: file ./kdeui/ui_standards.rc line 186
+#. i18n: file ./tdeui/ui_standards.rc line 186
 #: common_texts.cpp:254 rc.cpp:75 rc.cpp:271
 #, no-c-format
 msgid "Main Toolbar"
 msgstr "メインツールバー"
 
-#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 27
+#. i18n: file ./tdeui/kshortcutdialog_simple.ui line 27
 #: rc.cpp:78
 #, no-c-format
 msgid "Shortcut:"
 msgstr "ショートカット:"
 
-#. i18n: file ./kdeui/kshortcutdialog_simple.ui line 65
+#. i18n: file ./tdeui/kshortcutdialog_simple.ui line 65
 #: rc.cpp:81
 #, no-c-format
 msgid "Alt+Tab"
 msgstr "Alt+Tab"
 
-#. i18n: file ./kdeui/kspellui.ui line 38
+#. i18n: file ./tdeui/kspellui.ui line 38
 #: rc.cpp:90 rc.cpp:307
 #, no-c-format
 msgid "Unknown word:"
 msgstr "未知の単語:"
 
-#. i18n: file ./kdeui/kspellui.ui line 44
+#. i18n: file ./tdeui/kspellui.ui line 44
 #: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322
 #, no-c-format
 msgid ""
@@ -205,25 +205,25 @@ msgstr ""
 "べて置換」をクリックしてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 52
+#. i18n: file ./tdeui/kspellui.ui line 52
 #: rc.cpp:99 rc.cpp:316
 #, no-c-format
 msgid "<b>misspelled</b>"
 msgstr "スペル間違い"
 
-#. i18n: file ./kdeui/kspellui.ui line 55
+#. i18n: file ./tdeui/kspellui.ui line 55
 #: rc.cpp:102 rc.cpp:319
 #, no-c-format
 msgid "Unknown word"
 msgstr "未知の単語"
 
-#. i18n: file ./kdeui/kspellui.ui line 69
+#. i18n: file ./tdeui/kspellui.ui line 69
 #: rc.cpp:111 rc.cpp:328
 #, no-c-format
 msgid "&Language:"
 msgstr "言語(&L):"
 
-#. i18n: file ./kdeui/kspellui.ui line 77
+#. i18n: file ./tdeui/kspellui.ui line 77
 #: rc.cpp:114 rc.cpp:209 rc.cpp:331 rc.cpp:389
 #, no-c-format
 msgid ""
@@ -235,19 +235,19 @@ msgstr ""
 "<p>スペルチェックを行う文書の言語を選択してください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 88
+#. i18n: file ./tdeui/kspellui.ui line 88
 #: rc.cpp:119 rc.cpp:336
 #, no-c-format
 msgid "... the <b>misspelled</b> word shown in context ..."
 msgstr "... スペル間違いの単語とその文脈 ..."
 
-#. i18n: file ./kdeui/kspellui.ui line 94
+#. i18n: file ./tdeui/kspellui.ui line 94
 #: rc.cpp:122 rc.cpp:339
 #, no-c-format
 msgid "Text excerpt showing the unknown word in its context."
 msgstr "未知の単語とその文脈の一部を表示しています。"
 
-#. i18n: file ./kdeui/kspellui.ui line 99
+#. i18n: file ./tdeui/kspellui.ui line 99
 #: rc.cpp:125 rc.cpp:342
 #, no-c-format
 msgid ""
@@ -263,13 +263,13 @@ msgstr ""
 "り広い範囲を読んでからスペルチェックを続けてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 107
+#. i18n: file ./tdeui/kspellui.ui line 107
 #: rc.cpp:130 rc.cpp:347
 #, no-c-format
 msgid "<< Add to Dictionary"
 msgstr "<< 辞書に追加"
 
-#. i18n: file ./kdeui/kspellui.ui line 113
+#. i18n: file ./tdeui/kspellui.ui line 113
 #: rc.cpp:133 rc.cpp:350
 #, no-c-format
 msgid ""
@@ -290,13 +290,13 @@ msgstr ""
 "単語をそのままにしておく場合は、「無視」または「すべて無視」をクリックしてください。\n"
 "</p>"
 
-#. i18n: file ./kdeui/kspellui.ui line 138
+#. i18n: file ./tdeui/kspellui.ui line 138
 #: rc.cpp:139 rc.cpp:405
 #, no-c-format
 msgid "R&eplace All"
 msgstr "すべて置換(&E)"
 
-#. i18n: file ./kdeui/kspellui.ui line 143
+#. i18n: file ./tdeui/kspellui.ui line 143
 #: rc.cpp:142 rc.cpp:408
 #, no-c-format
 msgid ""
@@ -309,19 +309,19 @@ msgstr ""
 "<p>文書中のこの単語をすべて編集ボックスのテキストに置き換えるには、ここをクリックしてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 149
+#. i18n: file ./tdeui/kspellui.ui line 149
 #: rc.cpp:147 rc.cpp:356
 #, no-c-format
 msgid "Suggested Words"
 msgstr "置き換え候補"
 
-#. i18n: file ./kdeui/kspellui.ui line 165
+#. i18n: file ./tdeui/kspellui.ui line 165
 #: rc.cpp:150 rc.cpp:359
 #, no-c-format
 msgid "Suggestion List"
 msgstr "置き換え候補のリスト"
 
-#. i18n: file ./kdeui/kspellui.ui line 171
+#. i18n: file ./tdeui/kspellui.ui line 171
 #: rc.cpp:153 rc.cpp:362
 #, no-c-format
 msgid ""
@@ -339,13 +339,13 @@ msgstr ""
 "<p>現在の単語だけを置き換えるには「置換」をクリックしてください。文書中のこの単語をすべて置き換えるには「すべてを置換」をクリックしてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 179
-#: kdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
+#. i18n: file ./tdeui/kspellui.ui line 179
+#: tdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
 #, no-c-format
 msgid "&Replace"
 msgstr "置換(&R)"
 
-#. i18n: file ./kdeui/kspellui.ui line 184
+#. i18n: file ./tdeui/kspellui.ui line 184
 #: rc.cpp:162 rc.cpp:400
 #, no-c-format
 msgid ""
@@ -358,13 +358,13 @@ msgstr ""
 "<p>現在の単語のみを編集ボックスのテキストに置き換えるには、ここをクリックしてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 192
+#. i18n: file ./tdeui/kspellui.ui line 192
 #: rc.cpp:167 rc.cpp:368
 #, no-c-format
 msgid "Replace &with:"
 msgstr "次と置換(&W):"
 
-#. i18n: file ./kdeui/kspellui.ui line 201
+#. i18n: file ./tdeui/kspellui.ui line 201
 #: rc.cpp:170 rc.cpp:194 rc.cpp:371 rc.cpp:377
 #, no-c-format
 msgid ""
@@ -381,13 +381,13 @@ msgstr ""
 "<p>現在の単語のみを置き換えるには「置換」をクリックしてください。文書中のこの単語をすべて置き換えるには「すべて置換」をクリックしてください。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 209
+#. i18n: file ./tdeui/kspellui.ui line 209
 #: rc.cpp:176 rc.cpp:413
 #, no-c-format
 msgid "&Ignore"
 msgstr "無視(&I)"
 
-#. i18n: file ./kdeui/kspellui.ui line 215
+#. i18n: file ./tdeui/kspellui.ui line 215
 #: rc.cpp:179 rc.cpp:416
 #, no-c-format
 msgid ""
@@ -402,13 +402,13 @@ msgstr ""
 "<p>これは、固有名詞や略語または外国語の単語を辞書に登録せずに使う場合に役立ちます。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 223
+#. i18n: file ./tdeui/kspellui.ui line 223
 #: rc.cpp:185 rc.cpp:422
 #, no-c-format
 msgid "I&gnore All"
 msgstr "すべて無視(&G)"
 
-#. i18n: file ./kdeui/kspellui.ui line 229
+#. i18n: file ./tdeui/kspellui.ui line 229
 #: rc.cpp:188 rc.cpp:425 rc.cpp:434
 #, no-c-format
 msgid ""
@@ -424,19 +424,19 @@ msgstr ""
 "<p>これは、固有名詞や略語または外国語の単語を辞書に登録せずに使う場合に役立ちます。</p>\n"
 "</qt>"
 
-#. i18n: file ./kdeui/kspellui.ui line 248
+#. i18n: file ./tdeui/kspellui.ui line 248
 #: rc.cpp:200 rc.cpp:394
 #, no-c-format
 msgid "S&uggest"
 msgstr "候補(&U)"
 
-#. i18n: file ./kdeui/kspellui.ui line 254
-#: kdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
+#. i18n: file ./tdeui/kspellui.ui line 254
+#: tdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
 #, no-c-format
 msgid "English"
 msgstr "英語"
 
-#. i18n: file ./kdeui/kspellui.ui line 261
+#. i18n: file ./tdeui/kspellui.ui line 261
 #: rc.cpp:206 rc.cpp:386
 #, no-c-format
 msgid "Language Selection"
@@ -471,7 +471,7 @@ msgstr ""
 "の問題だと思われる場合は、http://bugs.kde.org/ にバグを報告してください。問題を再現できるテストケースも添えていただけると助かります。"
 
 #. i18n: file ./khtml/kjserrordlg.ui line 39
-#: kdeui/kstdaction_p.h:58 kdeui/kstdguiitem.cpp:161 rc.cpp:226
+#: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:226
 #, no-c-format
 msgid "C&lear"
 msgstr "クリア(&L)"
@@ -539,7 +539,7 @@ msgid ""
 msgstr "これはスペルチェッカーが使用する標準の言語です。ドロップダウンリストにお使いの言語の使用可能なすべての辞書が表示されます。"
 
 #. i18n: file ./kspell2/ui/configui.ui line 34
-#: common_texts.cpp:118 kdeui/keditcl2.cpp:723 kdeui/keditcl2.cpp:862
+#: common_texts.cpp:118 tdeui/keditcl2.cpp:723 tdeui/keditcl2.cpp:862
 #: kutils/kfinddialog.cpp:161 rc.cpp:277
 #, no-c-format
 msgid "Options"
@@ -701,7 +701,7 @@ msgstr ""
 "[email protected],[email protected],[email protected],"
 "[email protected],[email protected]"
 
-#: common_texts.cpp:24 kdeui/kconfigdialog.cpp:56 kutils/kcmultidialog.cpp:59
+#: common_texts.cpp:24 tdeui/kconfigdialog.cpp:56 kutils/kcmultidialog.cpp:59
 #: kutils/kcmultidialog.h:104 kutils/ksettings/dialog.cpp:571
 msgid "Configure"
 msgstr "設定"
@@ -734,7 +734,7 @@ msgstr "ページ"
 msgid "Border"
 msgstr "枠"
 
-#: common_texts.cpp:32 kdeui/ktoolbar.cpp:2116
+#: common_texts.cpp:32 tdeui/ktoolbar.cpp:2116
 msgid "Orientation"
 msgstr "方向"
 
@@ -819,7 +819,7 @@ msgid "&Zoom"
 msgstr "ズーム(&Z)"
 
 #: arts/message/artsmessage.cc:89 common_texts.cpp:54 kabc/lock.cpp:132
-#: kdeui/kmessagebox.cpp:760 kdeui/kmessagebox.cpp:790 kjs/object.cpp:493
+#: tdeui/kmessagebox.cpp:760 tdeui/kmessagebox.cpp:790 kjs/object.cpp:493
 #: kutils/kpluginselector.cpp:248
 msgid "Error"
 msgstr "エラー"
@@ -833,8 +833,8 @@ msgid "Charset:"
 msgstr "文字セット:"
 
 #: arts/message/artsmessage.cc:83 common_texts.cpp:59
-#: kdeui/kmessagebox.cpp:561 kdeui/kmessagebox.cpp:633
-#: kdeui/kmessagebox.cpp:709
+#: tdeui/kmessagebox.cpp:561 tdeui/kmessagebox.cpp:633
+#: tdeui/kmessagebox.cpp:709
 msgid "Warning"
 msgstr "警告"
 
@@ -850,8 +850,8 @@ msgstr "内容"
 msgid "About"
 msgstr "情報"
 
-#: common_texts.cpp:63 common_texts.cpp:176 kdeui/kaboutapplication.cpp:64
-#: kdeui/kaboutapplication.cpp:88
+#: common_texts.cpp:63 common_texts.cpp:176 tdeui/kaboutapplication.cpp:64
+#: tdeui/kaboutapplication.cpp:88
 msgid "&About"
 msgstr "情報(&A)"
 
@@ -863,10 +863,10 @@ msgstr "情報(&B)"
 msgid "Untitled"
 msgstr "名前なし"
 
-#: common_texts.cpp:67 kdecore/kapplication.cpp:1417
-#: kdecore/kapplication.cpp:2245 kdecore/kapplication.cpp:2280
-#: kdecore/kapplication.cpp:2551 kdecore/kapplication.cpp:2573
-#: kdecore/kdebug.cpp:295 kdeui/kdialogbase.cpp:908 kdeui/kstdguiitem.cpp:99
+#: common_texts.cpp:67 tdecore/kapplication.cpp:1417
+#: tdecore/kapplication.cpp:2245 tdecore/kapplication.cpp:2280
+#: tdecore/kapplication.cpp:2551 tdecore/kapplication.cpp:2573
+#: tdecore/kdebug.cpp:295 tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
 msgid "&OK"
 msgstr "&OK"
 
@@ -878,15 +878,15 @@ msgstr "オン"
 msgid "Off"
 msgstr "オフ"
 
-#: common_texts.cpp:73 kdeui/kdialogbase.cpp:938 kdeui/kstdguiitem.cpp:144
+#: common_texts.cpp:73 tdeui/kdialogbase.cpp:938 tdeui/kstdguiitem.cpp:144
 msgid "&Apply"
 msgstr "適用(&A)"
 
-#: common_texts.cpp:74 kdecore/kstdaccel.cpp:52
+#: common_texts.cpp:74 tdecore/kstdaccel.cpp:52
 msgid "File"
 msgstr "ファイル"
 
-#: common_texts.cpp:75 kdeui/kstdguiitem.cpp:120
+#: common_texts.cpp:75 tdeui/kstdguiitem.cpp:120
 msgid "&Discard"
 msgstr "破棄(&D)"
 
@@ -894,7 +894,7 @@ msgstr "破棄(&D)"
 msgid "Discard"
 msgstr "破棄"
 
-#: common_texts.cpp:80 kdecore/kstdaccel.cpp:59
+#: common_texts.cpp:80 tdecore/kstdaccel.cpp:59
 msgid "Edit"
 msgstr "編集"
 
@@ -910,19 +910,19 @@ msgstr "表示"
 msgid "E&xit"
 msgstr "終了(&X)"
 
-#: common_texts.cpp:86 kdecore/kstdaccel.cpp:58
+#: common_texts.cpp:86 tdecore/kstdaccel.cpp:58
 msgid "Quit"
 msgstr "終了"
 
-#: common_texts.cpp:87 kdeui/kstdaction_p.h:50 kdeui/kstdguiitem.cpp:232
+#: common_texts.cpp:87 tdeui/kstdaction_p.h:50 tdeui/kstdguiitem.cpp:232
 msgid "&Quit"
 msgstr "終了(&Q)"
 
-#: common_texts.cpp:88 kdecore/kstdaccel.cpp:88 kded/kbuildsycoca.cpp:753
+#: common_texts.cpp:88 tdecore/kstdaccel.cpp:88 kded/kbuildsycoca.cpp:753
 msgid "Reload"
 msgstr "再読み込み"
 
-#: common_texts.cpp:89 kdecore/kstdaccel.cpp:86
+#: common_texts.cpp:89 tdecore/kstdaccel.cpp:86
 msgid "Back"
 msgstr "戻る"
 
@@ -946,7 +946,7 @@ msgstr "新しいゲーム"
 msgid "&New Game"
 msgstr "新しいゲーム(&N)"
 
-#: common_texts.cpp:99 kdecore/kkeyserver_x11.cpp:133 kdecore/kstdaccel.cpp:53
+#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:133 tdecore/kstdaccel.cpp:53
 msgid "Open"
 msgstr "開く"
 
@@ -958,7 +958,7 @@ msgstr "ファイルを開く"
 msgid "Open..."
 msgstr "開く..."
 
-#: common_texts.cpp:102 kdeui/kstdaction_p.h:41 kdeui/kstdguiitem.cpp:226
+#: common_texts.cpp:102 tdeui/kstdaction_p.h:41 tdeui/kstdguiitem.cpp:226
 msgid "&Open..."
 msgstr "開く(&O)..."
 
@@ -970,7 +970,7 @@ msgstr "切り取り(&C)"
 msgid "C&ut"
 msgstr "切り取り(&U)"
 
-#: common_texts.cpp:106 kdeui/kfontdialog.cpp:132
+#: common_texts.cpp:106 tdeui/kfontdialog.cpp:132
 msgid "Font"
 msgstr "フォント"
 
@@ -982,11 +982,11 @@ msgstr "前景色(&F)"
 msgid "&Background Color"
 msgstr "背景色(&B)"
 
-#: common_texts.cpp:109 kdecore/kstdaccel.cpp:56
+#: common_texts.cpp:109 tdecore/kstdaccel.cpp:56
 msgid "Save"
 msgstr "保存"
 
-#: common_texts.cpp:110 kdeui/kstdaction_p.h:43 kdeui/kstdguiitem.cpp:127
+#: common_texts.cpp:110 tdeui/kstdaction_p.h:43 tdeui/kstdguiitem.cpp:127
 msgid "&Save"
 msgstr "保存(&S)"
 
@@ -1003,20 +1003,20 @@ msgstr "名前を付けて保存..."
 msgid "S&ave As..."
 msgstr "名前を付けて保存(&A)..."
 
-#: common_texts.cpp:116 kdeui/kstdaction_p.h:47 kdeui/kstdguiitem.cpp:207
+#: common_texts.cpp:116 tdeui/kstdaction_p.h:47 tdeui/kstdguiitem.cpp:207
 msgid "&Print..."
 msgstr "印刷(&P)..."
 
-#: common_texts.cpp:117 kdeui/kmessagebox.cpp:837 kdeui/kmessagebox.cpp:867
+#: common_texts.cpp:117 tdeui/kmessagebox.cpp:837 tdeui/kmessagebox.cpp:867
 msgid "Sorry"
 msgstr "すみません"
 
-#: common_texts.cpp:119 kdeui/kstdguiitem.cpp:269
-#: kdeui/kswitchlanguagedialog.cpp:304
+#: common_texts.cpp:119 tdeui/kstdguiitem.cpp:269
+#: tdeui/kswitchlanguagedialog.cpp:304
 msgid "Remove"
 msgstr "削除"
 
-#: common_texts.cpp:120 kdeui/kstdguiitem.cpp:264
+#: common_texts.cpp:120 tdeui/kstdguiitem.cpp:264
 msgid "Add"
 msgstr "追加"
 
@@ -1024,11 +1024,11 @@ msgstr "追加"
 msgid "Change"
 msgstr "変更"
 
-#: common_texts.cpp:123 kdeui/kstdguiitem.cpp:220
+#: common_texts.cpp:123 tdeui/kstdguiitem.cpp:220
 msgid "&Delete"
 msgstr "削除(&D)"
 
-#: common_texts.cpp:125 kdeui/kfontdialog.cpp:225 kdeui/kfontdialog.cpp:477
+#: common_texts.cpp:125 tdeui/kfontdialog.cpp:225 tdeui/kfontdialog.cpp:477
 msgid "Italic"
 msgstr "イタリック"
 
@@ -1036,7 +1036,7 @@ msgstr "イタリック"
 msgid "Roman"
 msgstr "ローマン"
 
-#: common_texts.cpp:132 kdeui/kmessagebox.cpp:913
+#: common_texts.cpp:132 tdeui/kmessagebox.cpp:913
 msgid "Information"
 msgstr "情報"
 
@@ -1056,14 +1056,14 @@ msgstr "ローカルに接続中"
 msgid "Browse..."
 msgstr "ブラウズ..."
 
-#: common_texts.cpp:137 kdecore/kkeyserver_x11.cpp:127 kdeui/keditcl2.cpp:107
-#: kdeui/keditcl2.cpp:120 kdeui/keditcl2.cpp:377 kdeui/keditcl2.cpp:390
-#: kdeui/keditcl2.cpp:456 kdeui/keditcl2.cpp:469 kdeui/kstdguiitem.cpp:259
+#: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:127 tdeui/keditcl2.cpp:107
+#: tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377 tdeui/keditcl2.cpp:390
+#: tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469 tdeui/kstdguiitem.cpp:259
 #: khtml/ecma/kjs_debugwin.cpp:466 kutils/kreplace.cpp:319
 msgid "Stop"
 msgstr "停止"
 
-#: common_texts.cpp:138 kdeui/keditlistbox.cpp:136
+#: common_texts.cpp:138 tdeui/keditlistbox.cpp:136
 #: kresources/configpage.cpp:127
 msgid "&Remove"
 msgstr "削除(&R)"
@@ -1072,7 +1072,7 @@ msgstr "削除(&R)"
 msgid "&Properties..."
 msgstr "プロパティ(&P)..."
 
-#: common_texts.cpp:140 kdeui/kstdguiitem.cpp:279
+#: common_texts.cpp:140 tdeui/kstdguiitem.cpp:279
 msgid "Properties"
 msgstr "プロパティ"
 
@@ -1120,36 +1120,36 @@ msgstr "復元"
 msgid "Appearance"
 msgstr "外観"
 
-#: common_texts.cpp:152 kdecore/kkeyserver_x11.cpp:137
-#: kdecore/kstdaccel.cpp:57
+#: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:137
+#: tdecore/kstdaccel.cpp:57
 msgid "Print"
 msgstr "印刷"
 
-#: common_texts.cpp:153 kdecore/kcalendarsystem.cpp:135
+#: common_texts.cpp:153 tdecore/kcalendarsystem.cpp:135
 msgid "Monday"
 msgstr "月曜日"
 
-#: common_texts.cpp:154 kdecore/kcalendarsystem.cpp:136
+#: common_texts.cpp:154 tdecore/kcalendarsystem.cpp:136
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: common_texts.cpp:155 kdecore/kcalendarsystem.cpp:137
+#: common_texts.cpp:155 tdecore/kcalendarsystem.cpp:137
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: common_texts.cpp:156 kdecore/kcalendarsystem.cpp:138
+#: common_texts.cpp:156 tdecore/kcalendarsystem.cpp:138
 msgid "Thursday"
 msgstr "木曜日"
 
-#: common_texts.cpp:157 kdecore/kcalendarsystem.cpp:139
+#: common_texts.cpp:157 tdecore/kcalendarsystem.cpp:139
 msgid "Friday"
 msgstr "金曜日"
 
-#: common_texts.cpp:158 kdecore/kcalendarsystem.cpp:140
+#: common_texts.cpp:158 tdecore/kcalendarsystem.cpp:140
 msgid "Saturday"
 msgstr "土曜日"
 
-#: common_texts.cpp:159 kdecore/kcalendarsystem.cpp:141
+#: common_texts.cpp:159 tdecore/kcalendarsystem.cpp:141
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -1169,33 +1169,33 @@ msgstr "新しいビュー(&N)"
 msgid "&Insert"
 msgstr "挿入(&I)"
 
-#: common_texts.cpp:168 kdeui/ktip.cpp:297
+#: common_texts.cpp:168 tdeui/ktip.cpp:297
 msgid ""
 "_: Opposite to Previous\n"
 "&Next"
 msgstr "次(&N)"
 
-#: common_texts.cpp:169 kdeui/ktip.cpp:292
+#: common_texts.cpp:169 tdeui/ktip.cpp:292
 msgid "&Previous"
 msgstr "前(&P)"
 
 #: common_texts.cpp:170 kcert/kcertpart.cc:730 kcert/kcertpart.cc:746
-#: kdecore/kstdaccel.cpp:73 kdeui/keditcl2.cpp:456 kdeui/keditcl2.cpp:469
-#: kdeui/keditcl2.cpp:830 kutils/kreplace.cpp:45 kutils/kreplace.cpp:49
+#: tdecore/kstdaccel.cpp:73 tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469
+#: tdeui/keditcl2.cpp:830 kutils/kreplace.cpp:45 kutils/kreplace.cpp:49
 msgid "Replace"
 msgstr "置換"
 
-#: common_texts.cpp:171 kdeui/kstdaction_p.h:65
+#: common_texts.cpp:171 tdeui/kstdaction_p.h:65
 msgid "&Replace..."
 msgstr "置換(&R)..."
 
 #: common_texts.cpp:173 kabc/ldapconfigwidget.cpp:156
-#: kabc/ldapconfigwidget.cpp:168 kdeui/klineedit.cpp:914
-#: kdeui/ktoolbar.cpp:2058
+#: kabc/ldapconfigwidget.cpp:168 tdeui/klineedit.cpp:914
+#: tdeui/ktoolbar.cpp:2058
 msgid "Default"
 msgstr "標準"
 
-#: common_texts.cpp:174 kdeui/kstdguiitem.cpp:180
+#: common_texts.cpp:174 tdeui/kstdguiitem.cpp:180
 msgid "&Defaults"
 msgstr "標準設定(&D)"
 
@@ -1207,15 +1207,15 @@ msgstr "目次(&C)"
 msgid "Open Recent"
 msgstr "最近のファイルを開く"
 
-#: common_texts.cpp:178 kdeui/kstdaction_p.h:42
+#: common_texts.cpp:178 tdeui/kstdaction_p.h:42
 msgid "Open &Recent"
 msgstr "最近のファイルを開く(&R)"
 
-#: common_texts.cpp:179 kdeui/kstdaction_p.h:61 khtml/khtml_part.cpp:4258
+#: common_texts.cpp:179 tdeui/kstdaction_p.h:61 khtml/khtml_part.cpp:4258
 msgid "&Find..."
 msgstr "検索(&F)..."
 
-#: common_texts.cpp:180 kdeui/kstdaction_p.h:62
+#: common_texts.cpp:180 tdeui/kstdaction_p.h:62
 msgid "Find &Next"
 msgstr "次を検索(&N)"
 
@@ -1223,7 +1223,7 @@ msgstr "次を検索(&N)"
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: common_texts.cpp:183 kdeui/kstdaction_p.h:90
+#: common_texts.cpp:183 tdeui/kstdaction_p.h:90
 msgid "&Add Bookmark"
 msgstr "ブックマークに追加(&A)"
 
@@ -1231,16 +1231,16 @@ msgstr "ブックマークに追加(&A)"
 msgid "&Edit Bookmarks..."
 msgstr "ブックマークを編集(&E)..."
 
-#: common_texts.cpp:186 kdeui/kstdaction_p.h:93
+#: common_texts.cpp:186 tdeui/kstdaction_p.h:93
 msgid "&Spelling..."
 msgstr "スペルチェック(&S)..."
 
-#: common_texts.cpp:187 kdeui/kstdaction.cpp:238 kdeui/kstdaction_p.h:95
+#: common_texts.cpp:187 tdeui/kstdaction.cpp:238 tdeui/kstdaction_p.h:95
 msgid "Show &Menubar"
 msgstr "メニューバーを表示(&M)"
 
-#: common_texts.cpp:188 kdeui/kstdaction.cpp:254 kdeui/kstdaction.cpp:265
-#: kdeui/kstdaction_p.h:96
+#: common_texts.cpp:188 tdeui/kstdaction.cpp:254 tdeui/kstdaction.cpp:265
+#: tdeui/kstdaction_p.h:96
 msgid "Show &Toolbar"
 msgstr "ツールバーを表示(&T)"
 
@@ -1256,7 +1256,7 @@ msgstr "キー割り当てを設定(&K)..."
 msgid "&Preferences..."
 msgstr "設定(&P)..."
 
-#: common_texts.cpp:193 kdeui/kmessagebox.cpp:928
+#: common_texts.cpp:193 tdeui/kmessagebox.cpp:928
 msgid "Do not show this message again"
 msgstr "今後はこのメッセージを表示しない"
 
@@ -1658,7 +1658,7 @@ msgstr "住所"
 
 #: kabc/addresseedialog.cpp:71 kabc/addresseedialog.cpp:101
 #: kabc/distributionlistdialog.cpp:190 kabc/distributionlisteditor.cpp:143
-#: kabc/field.cpp:211 kabc/scripts/field.src.cpp:104 kdeui/kaboutdialog.cpp:91
+#: kabc/field.cpp:211 kabc/scripts/field.src.cpp:104 tdeui/kaboutdialog.cpp:91
 msgid "Email"
 msgstr "Eメール"
 
@@ -1817,7 +1817,7 @@ msgstr "自宅のファクス"
 msgid "Work Fax"
 msgstr "仕事のファクス"
 
-#: kabc/address.cpp:312 kabc/phonenumber.cpp:199 kdecore/kcharsets.cpp:43
+#: kabc/address.cpp:312 kabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
 msgid "Other"
 msgstr "その他"
 
@@ -2058,7 +2058,7 @@ msgstr "丁目番地"
 msgid "Locality"
 msgstr "区市町村"
 
-#: kabc/address.cpp:217 kdeui/ktimezonewidget.cpp:46
+#: kabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
 msgid "Region"
 msgstr "都道府県"
 
@@ -2320,7 +2320,7 @@ msgstr "リビジョン日付"
 msgid "Sort String"
 msgstr "文字列を並べ替え"
 
-#: kabc/addressee.cpp:841 kdeui/kaboutdialog.cpp:92
+#: kabc/addressee.cpp:841 tdeui/kaboutdialog.cpp:92
 msgid "Homepage"
 msgstr "ホームページ"
 
@@ -2408,7 +2408,7 @@ msgid "kde-menu"
 msgstr "KDE メニュー"
 
 #: kded/kbuildsycoca.cpp:724 kded/kbuildsycoca.cpp:725 kded/kde-menu.cpp:119
-#: kded/khostname.cpp:362 kdeui/kaboutdialog.cpp:90
+#: kded/khostname.cpp:362 tdeui/kaboutdialog.cpp:90
 msgid "Author"
 msgstr "作者"
 
@@ -2605,13 +2605,13 @@ msgstr "前のツールビュー"
 msgid "Next Tool View"
 msgstr "次のツールビュー"
 
-#: kdeui/kdockwidget.cpp:2945 kmdi/kmdi/guiclient.cpp:148
+#: tdeui/kdockwidget.cpp:2945 kmdi/kmdi/guiclient.cpp:148
 #: kmdi/kmdiguiclient.cpp:260
 #, c-format
 msgid "Show %1"
 msgstr "%1 を表示"
 
-#: kdeui/kdockwidget.cpp:2939 kmdi/kmdi/guiclient.cpp:152
+#: tdeui/kdockwidget.cpp:2939 kmdi/kmdi/guiclient.cpp:152
 #: kmdi/kmdiguiclient.cpp:265
 #, c-format
 msgid "Hide %1"
@@ -2702,7 +2702,7 @@ msgstr "最大化(&A)"
 msgid "&Maximize"
 msgstr "最大化(&M)"
 
-#: kdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
+#: tdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
 msgid "&Minimize"
 msgstr "最小化(&M)"
 
@@ -2724,26 +2724,26 @@ msgid ""
 "Overlap"
 msgstr "重ねる"
 
-#: kdecore/klibloader.cpp:157
+#: tdecore/klibloader.cpp:157
 msgid "The library %1 does not offer an %2 function."
 msgstr "ライブラリ %1 には関数 %2 はありません。"
 
-#: kdecore/klibloader.cpp:168
+#: tdecore/klibloader.cpp:168
 msgid "The library %1 does not offer a KDE compatible factory."
 msgstr "ライブラリ %1 には KDE 互換のファクトリ機能はありません。"
 
-#: kdecore/klibloader.cpp:425
+#: tdecore/klibloader.cpp:425
 msgid "Library files for \"%1\" not found in paths."
 msgstr "\"%1\" のライブラリファイルがパスに見つかりません。"
 
-#: kdecore/kapplication.cpp:931
+#: tdecore/kapplication.cpp:931
 msgid ""
 "_: Dear Translator! Translate this string to the string 'LTR' in left-to-right "
 "languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew "
 "and Arabic) to get proper widget layout."
 msgstr "LTR"
 
-#: kdecore/kapplication.cpp:1404
+#: tdecore/kapplication.cpp:1404
 msgid ""
 "There was an error setting up inter-process communications for KDE. The message "
 "returned by the system was:\n"
@@ -2754,7 +2754,7 @@ msgstr ""
 "からのメッセージは以下のとおりです:\n"
 "\n"
 
-#: kdecore/kapplication.cpp:1408
+#: tdecore/kapplication.cpp:1408
 msgid ""
 "\n"
 "\n"
@@ -2764,23 +2764,23 @@ msgstr ""
 "\n"
 "\"dcopserver\" プログラムが起動しているか確認してください。"
 
-#: kdecore/kapplication.cpp:1415
+#: tdecore/kapplication.cpp:1415
 msgid "DCOP communications error (%1)"
 msgstr "DCOP コミュニケーションエラー (%1)"
 
-#: kdecore/kapplication.cpp:1433
+#: tdecore/kapplication.cpp:1433
 msgid "Use the X-server display 'displayname'"
 msgstr "Xサーバディスプレイ 'displayname' を使う"
 
-#: kdecore/kapplication.cpp:1435
+#: tdecore/kapplication.cpp:1435
 msgid "Use the QWS display 'displayname'"
 msgstr "QWS ディスプレイ 'displayname' を使う"
 
-#: kdecore/kapplication.cpp:1437
+#: tdecore/kapplication.cpp:1437
 msgid "Restore the application for the given 'sessionId'"
 msgstr "与えられた 'sessionId' のアプリケーションを復元する"
 
-#: kdecore/kapplication.cpp:1438
+#: tdecore/kapplication.cpp:1438
 msgid ""
 "Causes the application to install a private color\n"
 "map on an 8-bit display"
@@ -2788,7 +2788,7 @@ msgstr ""
 "8 ビットディスプレイでアプリケーションにプライベート\n"
 "カラーマップをインストールさせる"
 
-#: kdecore/kapplication.cpp:1439
+#: tdecore/kapplication.cpp:1439
 msgid ""
 "Limits the number of colors allocated in the color\n"
 "cube on an 8-bit display, if the application is\n"
@@ -2799,11 +2799,11 @@ msgstr ""
 "している場合は、8 ビットディスプレイでカラーキューブに割り\n"
 "当てられた色数を制限する"
 
-#: kdecore/kapplication.cpp:1440
+#: tdecore/kapplication.cpp:1440
 msgid "tells Qt to never grab the mouse or the keyboard"
 msgstr "Qt にマウスやキーボードを処理させない"
 
-#: kdecore/kapplication.cpp:1441
+#: tdecore/kapplication.cpp:1441
 msgid ""
 "running under a debugger can cause an implicit\n"
 "-nograb, use -dograb to override"
@@ -2811,15 +2811,15 @@ msgstr ""
 "debugger で実行すると暗示的に -nograb になります。\n"
 "これをオーバーライドするには -dograb を使用してください。"
 
-#: kdecore/kapplication.cpp:1442
+#: tdecore/kapplication.cpp:1442
 msgid "switches to synchronous mode for debugging"
 msgstr "デバッグのために同期モードに切り替える"
 
-#: kdecore/kapplication.cpp:1444
+#: tdecore/kapplication.cpp:1444
 msgid "defines the application font"
 msgstr "アプリケーションフォントを定義する"
 
-#: kdecore/kapplication.cpp:1446
+#: tdecore/kapplication.cpp:1446
 msgid ""
 "sets the default background color and an\n"
 "application palette (light and dark shades are\n"
@@ -2828,23 +2828,23 @@ msgstr ""
 "標準の背景色とアプリケーションパレットを\n"
 "設定する(光と影は計算されています)"
 
-#: kdecore/kapplication.cpp:1448
+#: tdecore/kapplication.cpp:1448
 msgid "sets the default foreground color"
 msgstr "標準の前景色を設定する"
 
-#: kdecore/kapplication.cpp:1450
+#: tdecore/kapplication.cpp:1450
 msgid "sets the default button color"
 msgstr "標準のボタン色を設定する"
 
-#: kdecore/kapplication.cpp:1451
+#: tdecore/kapplication.cpp:1451
 msgid "sets the application name"
 msgstr "アプリケーション名を設定する"
 
-#: kdecore/kapplication.cpp:1452
+#: tdecore/kapplication.cpp:1452
 msgid "sets the application title (caption)"
 msgstr "アプリケーションタイトル (キャプション) を設定する"
 
-#: kdecore/kapplication.cpp:1454
+#: tdecore/kapplication.cpp:1454
 msgid ""
 "forces the application to use a TrueColor visual on\n"
 "an 8-bit display"
@@ -2852,7 +2852,7 @@ msgstr ""
 "8 ビットディスプレイで強制的にアプリケーションに\n"
 "TrueColor を使わせる"
 
-#: kdecore/kapplication.cpp:1455
+#: tdecore/kapplication.cpp:1455
 msgid ""
 "sets XIM (X Input Method) input style. Possible\n"
 "values are onthespot, overthespot, offthespot and\n"
@@ -2861,75 +2861,75 @@ msgstr ""
 "XIM (X Input Method) 入力スタイルを設定。\n"
 "可能な値は onthespot, overthespot, offthespot, root。"
 
-#: kdecore/kapplication.cpp:1456
+#: tdecore/kapplication.cpp:1456
 msgid "set XIM server"
 msgstr "XIM サーバを設定"
 
-#: kdecore/kapplication.cpp:1457
+#: tdecore/kapplication.cpp:1457
 msgid "disable XIM"
 msgstr "XIM を無効にする"
 
-#: kdecore/kapplication.cpp:1460
+#: tdecore/kapplication.cpp:1460
 msgid "forces the application to run as QWS Server"
 msgstr "アプリケーションに QWS サーバとして実行されるように強制する"
 
-#: kdecore/kapplication.cpp:1462
+#: tdecore/kapplication.cpp:1462
 msgid "mirrors the whole layout of widgets"
 msgstr "ウィジェットのレイアウト全体を鏡像反転する"
 
-#: kdecore/kapplication.cpp:1468
+#: tdecore/kapplication.cpp:1468
 msgid "Use 'caption' as name in the titlebar"
 msgstr "タイトルバーの名前に 'caption' を使う"
 
-#: kdecore/kapplication.cpp:1469
+#: tdecore/kapplication.cpp:1469
 msgid "Use 'icon' as the application icon"
 msgstr "アプリケーションアイコンに 'icon' を使う"
 
-#: kdecore/kapplication.cpp:1470
+#: tdecore/kapplication.cpp:1470
 msgid "Use 'icon' as the icon in the titlebar"
 msgstr "タイトルバーのアイコンに 'icon' を使う"
 
-#: kdecore/kapplication.cpp:1471
+#: tdecore/kapplication.cpp:1471
 msgid "Use alternative configuration file"
 msgstr "代替設定ファイルを使う"
 
-#: kdecore/kapplication.cpp:1472
+#: tdecore/kapplication.cpp:1472
 msgid "Use the DCOP Server specified by 'server'"
 msgstr "'server' で指定される DCOP サーバを使う"
 
-#: kdecore/kapplication.cpp:1473
+#: tdecore/kapplication.cpp:1473
 msgid "Disable crash handler, to get core dumps"
 msgstr "クラッシュハンドラを無効にし、コアダンプを得る"
 
-#: kdecore/kapplication.cpp:1474
+#: tdecore/kapplication.cpp:1474
 msgid "Waits for a WM_NET compatible windowmanager"
 msgstr "WM_NET 互換のウィンドウマネージャを待つ"
 
-#: kdecore/kapplication.cpp:1475
+#: tdecore/kapplication.cpp:1475
 msgid "sets the application GUI style"
 msgstr "アプリケーションの GUI スタイルを設定する"
 
-#: kdecore/kapplication.cpp:1476
+#: tdecore/kapplication.cpp:1476
 msgid ""
 "sets the client geometry of the main widget - see man X for the argument format"
 msgstr "メインウィジェットのクライアントジオメトリを設定 - 引数のフォーマットについては man X をご覧ください"
 
-#: kdecore/kapplication.cpp:1516
+#: tdecore/kapplication.cpp:1516
 msgid ""
 "The style %1 was not found\n"
 msgstr ""
 "%1 スタイルは見つかりません\n"
 
-#: kdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
+#: tdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
 #: kstyles/web/webstyle.cpp:1604
 msgid "modified"
 msgstr "変更されました"
 
-#: kdecore/kapplication.cpp:2244 kdecore/kapplication.cpp:2279
+#: tdecore/kapplication.cpp:2244 tdecore/kapplication.cpp:2279
 msgid "Could not Launch Help Center"
 msgstr "ヘルプセンターを起動できません"
 
-#: kdecore/kapplication.cpp:2245 kdecore/kapplication.cpp:2280
+#: tdecore/kapplication.cpp:2245 tdecore/kapplication.cpp:2280
 #, c-format
 msgid ""
 "Could not launch the KDE Help Center:\n"
@@ -2940,11 +2940,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2550
+#: tdecore/kapplication.cpp:2550
 msgid "Could not Launch Mail Client"
 msgstr "メールクライアントを起動できませんでした"
 
-#: kdecore/kapplication.cpp:2551
+#: tdecore/kapplication.cpp:2551
 #, c-format
 msgid ""
 "Could not launch the mail client:\n"
@@ -2955,11 +2955,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2572
+#: tdecore/kapplication.cpp:2572
 msgid "Could not Launch Browser"
 msgstr "ブラウザを起動できませんでした"
 
-#: kdecore/kapplication.cpp:2573
+#: tdecore/kapplication.cpp:2573
 #, c-format
 msgid ""
 "Could not launch the browser:\n"
@@ -2970,48 +2970,48 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2637
+#: tdecore/kapplication.cpp:2637
 msgid ""
 "Could not register with DCOP.\n"
 msgstr ""
 "DCOP に登録できませんでした。\n"
 
-#: kdecore/kapplication.cpp:2672
+#: tdecore/kapplication.cpp:2672
 msgid ""
 "KLauncher could not be reached via DCOP.\n"
 msgstr ""
 "KLauncher は DCOP 経由で到達できませんでした。\n"
 
-#: kdecore/kwinmodule.cpp:456
+#: tdecore/twinmodule.cpp:456
 #, c-format
 msgid "Desktop %1"
 msgstr "デスクトップ %1"
 
-#: kdecore/kconfigbackend.cpp:1107 kdecore/kconfigbackend.cpp:1116
+#: tdecore/kconfigbackend.cpp:1107 tdecore/kconfigbackend.cpp:1116
 msgid ""
 "Will not save configuration.\n"
 msgstr ""
 "設定は保存されません。\n"
 
-#: kdecore/kconfigbackend.cpp:1109 kdecore/kconfigbackend.cpp:1117
+#: tdecore/kconfigbackend.cpp:1109 tdecore/kconfigbackend.cpp:1117
 msgid ""
 "Configuration file \"%1\" not writable.\n"
 msgstr ""
 "設定ファイル \"%1\" は書き込み不可です。\n"
 
-#: kdecore/kconfigbackend.cpp:1124
+#: tdecore/kconfigbackend.cpp:1124
 msgid "Please contact your system administrator."
 msgstr "システム管理者に連絡してください。"
 
-#: kdecore/kcmdlineargs.cpp:500 kdecore/kcmdlineargs.cpp:516
+#: tdecore/kcmdlineargs.cpp:500 tdecore/kcmdlineargs.cpp:516
 msgid "Unknown option '%1'."
 msgstr "未知のオプション '%1'。"
 
-#: kdecore/kcmdlineargs.cpp:524
+#: tdecore/kcmdlineargs.cpp:524
 msgid "'%1' missing."
 msgstr "'%1' がありません。"
 
-#: kdecore/kcmdlineargs.cpp:619
+#: tdecore/kcmdlineargs.cpp:619
 msgid ""
 "_: the 2nd argument is a list of name+address, one on each line\n"
 "%1 was written by\n"
@@ -3020,31 +3020,31 @@ msgstr ""
 "%1 の作者:\n"
 "%2"
 
-#: kdecore/kcmdlineargs.cpp:622
+#: tdecore/kcmdlineargs.cpp:622
 msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "このアプリケーションは匿名でありたい誰かによって書かれました。"
 
-#: kdecore/kcmdlineargs.cpp:629
+#: tdecore/kcmdlineargs.cpp:629
 msgid ""
 "Please use http://bugs.kde.org to report bugs.\n"
 msgstr ""
 "バグは http://bugs.kde.org へ報告してください。\n"
 
-#: kdecore/kcmdlineargs.cpp:632 kdecore/kcmdlineargs.cpp:634
+#: tdecore/kcmdlineargs.cpp:632 tdecore/kcmdlineargs.cpp:634
 msgid ""
 "Please report bugs to %1.\n"
 msgstr ""
 "バグは %1 へ報告してください。\n"
 
-#: kdecore/kcmdlineargs.cpp:660
+#: tdecore/kcmdlineargs.cpp:660
 msgid "Unexpected argument '%1'."
 msgstr "未知の引数 '%1'."
 
-#: kdecore/kcmdlineargs.cpp:765
+#: tdecore/kcmdlineargs.cpp:765
 msgid "Use --help to get a list of available command line options."
 msgstr "利用可能なコマンドラインオプションを表示するには --help を使ってください。"
 
-#: kdecore/kcmdlineargs.cpp:780
+#: tdecore/kcmdlineargs.cpp:780
 msgid ""
 "\n"
 "%1:\n"
@@ -3052,57 +3052,57 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: kdecore/kcmdlineargs.cpp:789
+#: tdecore/kcmdlineargs.cpp:789
 msgid "[options] "
 msgstr "[オプション] "
 
-#: kdecore/kcmdlineargs.cpp:796
+#: tdecore/kcmdlineargs.cpp:796
 msgid "[%1-options]"
 msgstr "[%1-オプション]"
 
-#: kdecore/kcmdlineargs.cpp:816
+#: tdecore/kcmdlineargs.cpp:816
 msgid ""
 "Usage: %1 %2\n"
 msgstr ""
 "使用法: %1 %2\n"
 
-#: kdecore/kcmdlineargs.cpp:819
+#: tdecore/kcmdlineargs.cpp:819
 msgid "Generic options"
 msgstr "一般的なオプション"
 
-#: kdecore/kcmdlineargs.cpp:820
+#: tdecore/kcmdlineargs.cpp:820
 msgid "Show help about options"
 msgstr "オプションに関するヘルプを表示"
 
-#: kdecore/kcmdlineargs.cpp:828
+#: tdecore/kcmdlineargs.cpp:828
 msgid "Show %1 specific options"
 msgstr "%1 に特有なオプションを表示"
 
-#: kdecore/kcmdlineargs.cpp:835
+#: tdecore/kcmdlineargs.cpp:835
 msgid "Show all options"
 msgstr "すべてのオプションを表示"
 
-#: kdecore/kcmdlineargs.cpp:836
+#: tdecore/kcmdlineargs.cpp:836
 msgid "Show author information"
 msgstr "著作者情報"
 
-#: kdecore/kcmdlineargs.cpp:837
+#: tdecore/kcmdlineargs.cpp:837
 msgid "Show version information"
 msgstr "バージョン情報を表示"
 
-#: kdecore/kcmdlineargs.cpp:838
+#: tdecore/kcmdlineargs.cpp:838
 msgid "Show license information"
 msgstr "ライセンス情報を表示"
 
-#: kdecore/kcmdlineargs.cpp:839
+#: tdecore/kcmdlineargs.cpp:839
 msgid "End of options"
 msgstr "オプションの最後"
 
-#: kdecore/kcmdlineargs.cpp:861
+#: tdecore/kcmdlineargs.cpp:861
 msgid "%1 options"
 msgstr "%1 オプション"
 
-#: kdecore/kcmdlineargs.cpp:863
+#: tdecore/kcmdlineargs.cpp:863
 msgid ""
 "\n"
 "Options:\n"
@@ -3110,7 +3110,7 @@ msgstr ""
 "\n"
 "オプション:\n"
 
-#: kdecore/kcmdlineargs.cpp:920
+#: tdecore/kcmdlineargs.cpp:920
 msgid ""
 "\n"
 "Arguments:\n"
@@ -3118,986 +3118,986 @@ msgstr ""
 "\n"
 "引数:\n"
 
-#: kdecore/kcmdlineargs.cpp:1282
+#: tdecore/kcmdlineargs.cpp:1282
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr "このアプリケーションによって開かれたファイルと URL は、使用後に削除されます"
 
-#: kdecore/ksockaddr.cpp:112
+#: tdecore/ksockaddr.cpp:112
 msgid "<unknown socket>"
 msgstr "<未知のソケット>"
 
-#: kdecore/ksockaddr.cpp:568 kdecore/ksockaddr.cpp:587
+#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
 msgid "<empty>"
 msgstr "<空>"
 
-#: kdecore/ksockaddr.cpp:571
+#: tdecore/ksockaddr.cpp:571
 msgid ""
 "_: 1: hostname, 2: port number\n"
 "%1 port %2"
 msgstr "%1 ポート %2"
 
-#: kdecore/ksockaddr.cpp:853
+#: tdecore/ksockaddr.cpp:853
 msgid "<empty UNIX socket>"
 msgstr "<空の UNIX ソケット>"
 
-#: kdecore/kcheckaccelerators.cpp:148
+#: tdecore/kcheckaccelerators.cpp:148
 msgid "Dr. Klash' Accelerator Diagnosis"
 msgstr "Dr. Klash アクセラレータ診断"
 
-#: kdecore/kcheckaccelerators.cpp:155
+#: tdecore/kcheckaccelerators.cpp:155
 msgid "&Disable automatic checking"
 msgstr "自動チェックを無効にする(&D)"
 
-#: kdecore/kcheckaccelerators.cpp:193
+#: tdecore/kcheckaccelerators.cpp:193
 msgid "<h2>Accelerators changed</h2>"
 msgstr "<h2>アクセラレータが変更されました</h2>"
 
-#: kdecore/kcheckaccelerators.cpp:199
+#: tdecore/kcheckaccelerators.cpp:199
 msgid "<h2>Accelerators removed</h2>"
 msgstr "<h2>アクセラレータが削除されました</h2>"
 
-#: kdecore/kcheckaccelerators.cpp:204
+#: tdecore/kcheckaccelerators.cpp:204
 msgid "<h2>Accelerators added (just for your info)</h2>"
 msgstr "<h2>アクセラレータが追加されました</h2>"
 
-#: kdecore/kstdaccel.cpp:54
+#: tdecore/kstdaccel.cpp:54
 msgid "New"
 msgstr "新規"
 
-#: kdecore/kstdaccel.cpp:65
+#: tdecore/kstdaccel.cpp:65
 msgid "Paste Selection"
 msgstr "選択を貼り付け"
 
-#: kdecore/kstdaccel.cpp:67
+#: tdecore/kstdaccel.cpp:67
 msgid "Deselect"
 msgstr "選択解除"
 
-#: kdecore/kstdaccel.cpp:68
+#: tdecore/kstdaccel.cpp:68
 msgid "Delete Word Backwards"
 msgstr "後ろ向きに単語を削除"
 
-#: kdecore/kstdaccel.cpp:69
+#: tdecore/kstdaccel.cpp:69
 msgid "Delete Word Forward"
 msgstr "前向きに単語を削除"
 
-#: kdecore/kkeyserver_x11.cpp:135 kdecore/kstdaccel.cpp:70
-#: kdeui/keditcl2.cpp:107 kdeui/keditcl2.cpp:120 kdeui/keditcl2.cpp:377
-#: kdeui/keditcl2.cpp:390 kdeui/keditcl2.cpp:700 kutils/kfinddialog.cpp:119
+#: tdecore/kkeyserver_x11.cpp:135 tdecore/kstdaccel.cpp:70
+#: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
+#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 kutils/kfinddialog.cpp:119
 msgid "Find"
 msgstr "検索"
 
-#: kdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
+#: tdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
 msgid "Find Next"
 msgstr "次を検索"
 
-#: kdecore/kstdaccel.cpp:72
+#: tdecore/kstdaccel.cpp:72
 msgid "Find Prev"
 msgstr "前を検索"
 
-#: kdecore/kstdaccel.cpp:74
+#: tdecore/kstdaccel.cpp:74
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: kdecore/kstdaccel.cpp:75
+#: tdecore/kstdaccel.cpp:75
 msgid ""
 "_: Opposite to End\n"
 "Home"
 msgstr "ホーム"
 
-#: kdecore/kstdaccel.cpp:76
+#: tdecore/kstdaccel.cpp:76
 msgid "End"
 msgstr "最後"
 
-#: kdecore/kstdaccel.cpp:77
+#: tdecore/kstdaccel.cpp:77
 msgid "Beginning of Line"
 msgstr "行頭"
 
-#: kdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
+#: tdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
 msgid "End of Line"
 msgstr "行末"
 
-#: kdecore/kstdaccel.cpp:79
+#: tdecore/kstdaccel.cpp:79
 msgid "Prior"
 msgstr "前"
 
-#: kdecore/kstdaccel.cpp:80
+#: tdecore/kstdaccel.cpp:80
 msgid ""
 "_: Opposite to Prior\n"
 "Next"
 msgstr "次"
 
-#: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976
+#: tdecore/kstdaccel.cpp:81 tdeui/keditcl2.cpp:976
 msgid "Go to Line"
 msgstr "行に移動"
 
-#: kdecore/kstdaccel.cpp:82
+#: tdecore/kstdaccel.cpp:82
 msgid "Add Bookmark"
 msgstr "ブックマークに追加"
 
-#: kdecore/kstdaccel.cpp:83
+#: tdecore/kstdaccel.cpp:83
 msgid "Zoom In"
 msgstr "拡大"
 
-#: kdecore/kstdaccel.cpp:84
+#: tdecore/kstdaccel.cpp:84
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: kdecore/kstdaccel.cpp:85
+#: tdecore/kstdaccel.cpp:85
 msgid "Up"
 msgstr "上"
 
-#: kdecore/kstdaccel.cpp:87
+#: tdecore/kstdaccel.cpp:87
 msgid "Forward"
 msgstr "進む"
 
-#: kdecore/kstdaccel.cpp:89
+#: tdecore/kstdaccel.cpp:89
 msgid "Popup Menu Context"
 msgstr "ポップアップメニューコンテキスト"
 
-#: kdecore/kstdaccel.cpp:90
+#: tdecore/kstdaccel.cpp:90
 msgid "Show Menu Bar"
 msgstr "メニューバーを表示"
 
-#: kdecore/kstdaccel.cpp:91
+#: tdecore/kstdaccel.cpp:91
 msgid "Backward Word"
 msgstr "後ろの単語"
 
-#: kdecore/kstdaccel.cpp:92
+#: tdecore/kstdaccel.cpp:92
 msgid "Forward Word"
 msgstr "前の単語"
 
-#: kdecore/kstdaccel.cpp:93
+#: tdecore/kstdaccel.cpp:93
 msgid "Activate Next Tab"
 msgstr "次のタブをアクティブに"
 
-#: kdecore/kstdaccel.cpp:94
+#: tdecore/kstdaccel.cpp:94
 msgid "Activate Previous Tab"
 msgstr "前のタブをアクティブに"
 
-#: kdecore/kstdaccel.cpp:95
+#: tdecore/kstdaccel.cpp:95
 msgid "Full Screen Mode"
 msgstr "フルスクリーンモード"
 
-#: kdecore/kstdaccel.cpp:98
+#: tdecore/kstdaccel.cpp:98
 msgid "What's This"
 msgstr "これは何"
 
-#: kdecore/kstdaccel.cpp:99 kdecore/kstdaccel.cpp:100 kdeui/klineedit.cpp:886
+#: tdecore/kstdaccel.cpp:99 tdecore/kstdaccel.cpp:100 tdeui/klineedit.cpp:886
 msgid "Text Completion"
 msgstr "テキスト補完"
 
-#: kdecore/kstdaccel.cpp:101
+#: tdecore/kstdaccel.cpp:101
 msgid "Previous Completion Match"
 msgstr "前の補完マッチ"
 
-#: kdecore/kstdaccel.cpp:102
+#: tdecore/kstdaccel.cpp:102
 msgid "Next Completion Match"
 msgstr "次の補完マッチ"
 
-#: kdecore/kstdaccel.cpp:103
+#: tdecore/kstdaccel.cpp:103
 msgid "Substring Completion"
 msgstr "文字列補完"
 
-#: kdecore/kstdaccel.cpp:104
+#: tdecore/kstdaccel.cpp:104
 msgid "Previous Item in List"
 msgstr "リスト中の前のアイテム"
 
-#: kdecore/kstdaccel.cpp:105
+#: tdecore/kstdaccel.cpp:105
 msgid "Next Item in List"
 msgstr "リスト中の次のアイテム"
 
-#: kdecore/kcalendarsystemhijri.cpp:298 kdecore/kcalendarsystemhijri.cpp:326
+#: tdecore/kcalendarsystemhijri.cpp:298 tdecore/kcalendarsystemhijri.cpp:326
 msgid "Muharram"
 msgstr "Muharram"
 
-#: kdecore/kcalendarsystemhijri.cpp:300 kdecore/kcalendarsystemhijri.cpp:328
+#: tdecore/kcalendarsystemhijri.cpp:300 tdecore/kcalendarsystemhijri.cpp:328
 msgid "Safar"
 msgstr "Safar"
 
-#: kdecore/kcalendarsystemhijri.cpp:302
+#: tdecore/kcalendarsystemhijri.cpp:302
 msgid "R. Awal"
 msgstr "R. Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:304
+#: tdecore/kcalendarsystemhijri.cpp:304
 msgid "R. Thaani"
 msgstr "R. Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:306
+#: tdecore/kcalendarsystemhijri.cpp:306
 msgid "J. Awal"
 msgstr "J. Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:308
+#: tdecore/kcalendarsystemhijri.cpp:308
 msgid "J. Thaani"
 msgstr "J. Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:310 kdecore/kcalendarsystemhijri.cpp:338
+#: tdecore/kcalendarsystemhijri.cpp:310 tdecore/kcalendarsystemhijri.cpp:338
 msgid "Rajab"
 msgstr "Rajab"
 
-#: kdecore/kcalendarsystemhijri.cpp:312 kdecore/kcalendarsystemhijri.cpp:340
+#: tdecore/kcalendarsystemhijri.cpp:312 tdecore/kcalendarsystemhijri.cpp:340
 msgid "Sha`ban"
 msgstr "Sha`ban"
 
-#: kdecore/kcalendarsystemhijri.cpp:314 kdecore/kcalendarsystemhijri.cpp:342
+#: tdecore/kcalendarsystemhijri.cpp:314 tdecore/kcalendarsystemhijri.cpp:342
 msgid "Ramadan"
 msgstr "Ramadan"
 
-#: kdecore/kcalendarsystemhijri.cpp:316 kdecore/kcalendarsystemhijri.cpp:344
+#: tdecore/kcalendarsystemhijri.cpp:316 tdecore/kcalendarsystemhijri.cpp:344
 msgid "Shawwal"
 msgstr "Shawwal"
 
-#: kdecore/kcalendarsystemhijri.cpp:318
+#: tdecore/kcalendarsystemhijri.cpp:318
 msgid "Qi`dah"
 msgstr "Qi`dah"
 
-#: kdecore/kcalendarsystemhijri.cpp:320
+#: tdecore/kcalendarsystemhijri.cpp:320
 msgid "Hijjah"
 msgstr "Hijjah"
 
-#: kdecore/kcalendarsystemhijri.cpp:330
+#: tdecore/kcalendarsystemhijri.cpp:330
 msgid "Rabi` al-Awal"
 msgstr "Rabi` al-Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:332
+#: tdecore/kcalendarsystemhijri.cpp:332
 msgid "Rabi` al-Thaani"
 msgstr "Rabi` al-Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:334
+#: tdecore/kcalendarsystemhijri.cpp:334
 msgid "Jumaada al-Awal"
 msgstr "Jumaada al-Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:336
+#: tdecore/kcalendarsystemhijri.cpp:336
 msgid "Jumaada al-Thaani"
 msgstr "Jumaada al-Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:346
+#: tdecore/kcalendarsystemhijri.cpp:346
 msgid "Thu al-Qi`dah"
 msgstr "Thu al-Qi`dah"
 
-#: kdecore/kcalendarsystemhijri.cpp:348
+#: tdecore/kcalendarsystemhijri.cpp:348
 msgid "Thu al-Hijjah"
 msgstr "Thu al-Hijjah"
 
-#: kdecore/kcalendarsystemhijri.cpp:363 kdecore/kcalendarsystemhijri.cpp:391
+#: tdecore/kcalendarsystemhijri.cpp:363 tdecore/kcalendarsystemhijri.cpp:391
 msgid "of Muharram"
 msgstr "Muharram の"
 
-#: kdecore/kcalendarsystemhijri.cpp:365 kdecore/kcalendarsystemhijri.cpp:393
+#: tdecore/kcalendarsystemhijri.cpp:365 tdecore/kcalendarsystemhijri.cpp:393
 msgid "of Safar"
 msgstr "Safar の"
 
-#: kdecore/kcalendarsystemhijri.cpp:367
+#: tdecore/kcalendarsystemhijri.cpp:367
 msgid "of R. Awal"
 msgstr "R. Awal の"
 
-#: kdecore/kcalendarsystemhijri.cpp:369
+#: tdecore/kcalendarsystemhijri.cpp:369
 msgid "of R. Thaani"
 msgstr "R. Thaani の"
 
-#: kdecore/kcalendarsystemhijri.cpp:371
+#: tdecore/kcalendarsystemhijri.cpp:371
 msgid "of J. Awal"
 msgstr "J. Awal の"
 
-#: kdecore/kcalendarsystemhijri.cpp:373
+#: tdecore/kcalendarsystemhijri.cpp:373
 msgid "of J. Thaani"
 msgstr "J. Thaani の"
 
-#: kdecore/kcalendarsystemhijri.cpp:375 kdecore/kcalendarsystemhijri.cpp:403
+#: tdecore/kcalendarsystemhijri.cpp:375 tdecore/kcalendarsystemhijri.cpp:403
 msgid "of Rajab"
 msgstr "Rajab の"
 
-#: kdecore/kcalendarsystemhijri.cpp:377 kdecore/kcalendarsystemhijri.cpp:405
+#: tdecore/kcalendarsystemhijri.cpp:377 tdecore/kcalendarsystemhijri.cpp:405
 msgid "of Sha`ban"
 msgstr "Sha`ban の"
 
-#: kdecore/kcalendarsystemhijri.cpp:379 kdecore/kcalendarsystemhijri.cpp:407
+#: tdecore/kcalendarsystemhijri.cpp:379 tdecore/kcalendarsystemhijri.cpp:407
 msgid "of Ramadan"
 msgstr "Ramadan の"
 
-#: kdecore/kcalendarsystemhijri.cpp:381 kdecore/kcalendarsystemhijri.cpp:409
+#: tdecore/kcalendarsystemhijri.cpp:381 tdecore/kcalendarsystemhijri.cpp:409
 msgid "of Shawwal"
 msgstr "Shawwal の"
 
-#: kdecore/kcalendarsystemhijri.cpp:383
+#: tdecore/kcalendarsystemhijri.cpp:383
 msgid "of Qi`dah"
 msgstr "Qi`dah の"
 
-#: kdecore/kcalendarsystemhijri.cpp:385
+#: tdecore/kcalendarsystemhijri.cpp:385
 msgid "of Hijjah"
 msgstr "Hijjah の"
 
-#: kdecore/kcalendarsystemhijri.cpp:395
+#: tdecore/kcalendarsystemhijri.cpp:395
 msgid "of Rabi` al-Awal"
 msgstr "Rabi` al-Awal の"
 
-#: kdecore/kcalendarsystemhijri.cpp:397
+#: tdecore/kcalendarsystemhijri.cpp:397
 msgid "of Rabi` al-Thaani"
 msgstr "Rabi` al-Thaani の"
 
-#: kdecore/kcalendarsystemhijri.cpp:399
+#: tdecore/kcalendarsystemhijri.cpp:399
 msgid "of Jumaada al-Awal"
 msgstr "Jumaada al-Awal の"
 
-#: kdecore/kcalendarsystemhijri.cpp:401
+#: tdecore/kcalendarsystemhijri.cpp:401
 msgid "of Jumaada al-Thaani"
 msgstr "al-Thaani の"
 
-#: kdecore/kcalendarsystemhijri.cpp:411
+#: tdecore/kcalendarsystemhijri.cpp:411
 msgid "of Thu al-Qi`dah"
 msgstr "Thu al-Qi`dah の"
 
-#: kdecore/kcalendarsystemhijri.cpp:413
+#: tdecore/kcalendarsystemhijri.cpp:413
 msgid "of Thu al-Hijjah"
 msgstr "Thu al-Hijjah の"
 
-#: kdecore/kcalendarsystemhijri.cpp:445
+#: tdecore/kcalendarsystemhijri.cpp:445
 msgid "Ith"
 msgstr "Ith"
 
-#: kdecore/kcalendarsystemhijri.cpp:447
+#: tdecore/kcalendarsystemhijri.cpp:447
 msgid "Thl"
 msgstr "Thl"
 
-#: kdecore/kcalendarsystemhijri.cpp:449
+#: tdecore/kcalendarsystemhijri.cpp:449
 msgid "Arb"
 msgstr "Arb"
 
-#: kdecore/kcalendarsystemhijri.cpp:451
+#: tdecore/kcalendarsystemhijri.cpp:451
 msgid "Kha"
 msgstr "Kha"
 
-#: kdecore/kcalendarsystemhijri.cpp:453
+#: tdecore/kcalendarsystemhijri.cpp:453
 msgid "Jum"
 msgstr "Jum"
 
-#: kdecore/kcalendarsystemhijri.cpp:455
+#: tdecore/kcalendarsystemhijri.cpp:455
 msgid "Sab"
 msgstr "Sab"
 
-#: kdecore/kcalendarsystemhijri.cpp:457
+#: tdecore/kcalendarsystemhijri.cpp:457
 msgid "Ahd"
 msgstr "Ahd"
 
-#: kdecore/kcalendarsystemhijri.cpp:463
+#: tdecore/kcalendarsystemhijri.cpp:463
 msgid "Yaum al-Ithnain"
 msgstr "Yaum al-Ithnain"
 
-#: kdecore/kcalendarsystemhijri.cpp:465
+#: tdecore/kcalendarsystemhijri.cpp:465
 msgid "Yau al-Thulatha"
 msgstr "Yau al-Thulatha"
 
-#: kdecore/kcalendarsystemhijri.cpp:467
+#: tdecore/kcalendarsystemhijri.cpp:467
 msgid "Yaum al-Arbi'a"
 msgstr "Yaum al-Arbi'a"
 
-#: kdecore/kcalendarsystemhijri.cpp:469
+#: tdecore/kcalendarsystemhijri.cpp:469
 msgid "Yaum al-Khamees"
 msgstr "Yaum al-Khamees"
 
-#: kdecore/kcalendarsystemhijri.cpp:471
+#: tdecore/kcalendarsystemhijri.cpp:471
 msgid "Yaum al-Jumma"
 msgstr "Yaum al-Jumma"
 
-#: kdecore/kcalendarsystemhijri.cpp:473
+#: tdecore/kcalendarsystemhijri.cpp:473
 msgid "Yaum al-Sabt"
 msgstr "Yaum al-Sabt"
 
-#: kdecore/kcalendarsystemhijri.cpp:475
+#: tdecore/kcalendarsystemhijri.cpp:475
 msgid "Yaum al-Ahad"
 msgstr "Yaum al-Ahad"
 
-#: kdecore/klocale.cpp:217
+#: tdecore/klocale.cpp:217
 msgid ""
 "_: Dear translator, please do not translate this string in any form, but pick "
 "the _right_ value out of NoPlural/TwoForms/French... If not sure what to do "
 "mail [email protected] and [email protected], they will tell you. Better leave that out "
 "if unsure, the programs will crash!!\n"
-"Definition of PluralForm - to be set by the translator of kdelibs.po"
+"Definition of PluralForm - to be set by the translator of tdelibs.po"
 msgstr "NoPlural"
 
-#: kdecore/kcalendarsystemgregorian.cpp:91 kdecore/klocale.cpp:553
+#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/klocale.cpp:553
 msgid ""
 "_: January\n"
 "Jan"
 msgstr "1月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:93 kdecore/klocale.cpp:554
+#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/klocale.cpp:554
 msgid ""
 "_: February\n"
 "Feb"
 msgstr "2月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:95 kdecore/klocale.cpp:555
+#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/klocale.cpp:555
 msgid ""
 "_: March\n"
 "Mar"
 msgstr "3月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:97 kdecore/klocale.cpp:556
+#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/klocale.cpp:556
 msgid ""
 "_: April\n"
 "Apr"
 msgstr "4月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:99 kdecore/klocale.cpp:557
+#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/klocale.cpp:557
 msgid ""
 "_: May short\n"
 "May"
 msgstr "5月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:101 kdecore/klocale.cpp:558
+#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/klocale.cpp:558
 msgid ""
 "_: June\n"
 "Jun"
 msgstr "6月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:103 kdecore/klocale.cpp:559
+#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/klocale.cpp:559
 msgid ""
 "_: July\n"
 "Jul"
 msgstr "7月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:105 kdecore/klocale.cpp:560
+#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/klocale.cpp:560
 msgid ""
 "_: August\n"
 "Aug"
 msgstr "8月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:107 kdecore/klocale.cpp:561
+#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/klocale.cpp:561
 msgid ""
 "_: September\n"
 "Sep"
 msgstr "9月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:109 kdecore/klocale.cpp:562
+#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/klocale.cpp:562
 msgid ""
 "_: October\n"
 "Oct"
 msgstr "10月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:111 kdecore/klocale.cpp:563
+#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/klocale.cpp:563
 msgid ""
 "_: November\n"
 "Nov"
 msgstr "11月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:113 kdecore/klocale.cpp:564
+#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/klocale.cpp:564
 msgid ""
 "_: December\n"
 "Dec"
 msgstr "12月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:119 kdecore/klocale.cpp:569
+#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/klocale.cpp:569
 msgid "January"
 msgstr "1月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:121 kdecore/klocale.cpp:570
+#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/klocale.cpp:570
 msgid "February"
 msgstr "2月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:123 kdecore/klocale.cpp:571
+#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/klocale.cpp:571
 msgid "March"
 msgstr "3月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:125 kdecore/klocale.cpp:572
+#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/klocale.cpp:572
 msgid "April"
 msgstr "4月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:127 kdecore/klocale.cpp:573
+#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/klocale.cpp:573
 msgid ""
 "_: May long\n"
 "May"
 msgstr "5月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:129 kdecore/klocale.cpp:574
+#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/klocale.cpp:574
 msgid "June"
 msgstr "6月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:131 kdecore/klocale.cpp:575
+#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/klocale.cpp:575
 msgid "July"
 msgstr "7月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:133 kdecore/klocale.cpp:576
+#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/klocale.cpp:576
 msgid "August"
 msgstr "8月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:135 kdecore/klocale.cpp:577
+#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/klocale.cpp:577
 msgid "September"
 msgstr "9月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:137 kdecore/klocale.cpp:578
+#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/klocale.cpp:578
 msgid "October"
 msgstr "10月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:139 kdecore/klocale.cpp:579
+#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/klocale.cpp:579
 msgid "November"
 msgstr "11月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:141 kdecore/klocale.cpp:580
+#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/klocale.cpp:580
 msgid "December"
 msgstr "12月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:156 kdecore/klocale.cpp:591
+#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/klocale.cpp:591
 msgid ""
 "_: of January\n"
 "of Jan"
 msgstr "1月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:158 kdecore/klocale.cpp:592
+#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/klocale.cpp:592
 msgid ""
 "_: of February\n"
 "of Feb"
 msgstr "2月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:160 kdecore/klocale.cpp:593
+#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/klocale.cpp:593
 msgid ""
 "_: of March\n"
 "of Mar"
 msgstr "3月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:162 kdecore/klocale.cpp:594
+#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/klocale.cpp:594
 msgid ""
 "_: of April\n"
 "of Apr"
 msgstr "4月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:164 kdecore/klocale.cpp:595
+#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/klocale.cpp:595
 msgid ""
 "_: of May short\n"
 "of May"
 msgstr "5月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:166 kdecore/klocale.cpp:596
+#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/klocale.cpp:596
 msgid ""
 "_: of June\n"
 "of Jun"
 msgstr "6月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:168 kdecore/klocale.cpp:597
+#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/klocale.cpp:597
 msgid ""
 "_: of July\n"
 "of Jul"
 msgstr "7月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:170 kdecore/klocale.cpp:598
+#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/klocale.cpp:598
 msgid ""
 "_: of August\n"
 "of Aug"
 msgstr "8月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:172 kdecore/klocale.cpp:599
+#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/klocale.cpp:599
 msgid ""
 "_: of September\n"
 "of Sep"
 msgstr "9月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:174 kdecore/klocale.cpp:600
+#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/klocale.cpp:600
 msgid ""
 "_: of October\n"
 "of Oct"
 msgstr "10月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:176 kdecore/klocale.cpp:601
+#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/klocale.cpp:601
 msgid ""
 "_: of November\n"
 "of Nov"
 msgstr "11月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:178 kdecore/klocale.cpp:602
+#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/klocale.cpp:602
 msgid ""
 "_: of December\n"
 "of Dec"
 msgstr "12月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:184 kdecore/klocale.cpp:607
+#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/klocale.cpp:607
 msgid "of January"
 msgstr "1月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:186 kdecore/klocale.cpp:608
+#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/klocale.cpp:608
 msgid "of February"
 msgstr "2月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:188 kdecore/klocale.cpp:609
+#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/klocale.cpp:609
 msgid "of March"
 msgstr "3月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:190 kdecore/klocale.cpp:610
+#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/klocale.cpp:610
 msgid "of April"
 msgstr "4月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:192 kdecore/klocale.cpp:611
+#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/klocale.cpp:611
 msgid ""
 "_: of May long\n"
 "of May"
 msgstr "5月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:194 kdecore/klocale.cpp:612
+#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/klocale.cpp:612
 msgid "of June"
 msgstr "6月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:196 kdecore/klocale.cpp:613
+#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/klocale.cpp:613
 msgid "of July"
 msgstr "7月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:198 kdecore/klocale.cpp:614
+#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/klocale.cpp:614
 msgid "of August"
 msgstr "8月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:200 kdecore/klocale.cpp:615
+#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/klocale.cpp:615
 msgid "of September"
 msgstr "9月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:202 kdecore/klocale.cpp:616
+#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/klocale.cpp:616
 msgid "of October"
 msgstr "10月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:204 kdecore/klocale.cpp:617
+#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/klocale.cpp:617
 msgid "of November"
 msgstr "11月"
 
-#: kdecore/kcalendarsystemgregorian.cpp:206 kdecore/klocale.cpp:618
+#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/klocale.cpp:618
 msgid "of December"
 msgstr "12月"
 
-#: kdecore/klocale.cpp:1773 kdecore/klocale.cpp:1913
+#: tdecore/klocale.cpp:1773 tdecore/klocale.cpp:1913
 msgid "pm"
 msgstr "午後"
 
-#: kdecore/klocale.cpp:1782 kdecore/klocale.cpp:1915
+#: tdecore/klocale.cpp:1782 tdecore/klocale.cpp:1915
 msgid "am"
 msgstr "午前"
 
-#: kdecore/klocale.cpp:1956
+#: tdecore/klocale.cpp:1956
 msgid ""
 "_: concatenation of dates and time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: kdecore/klocale.cpp:2447
+#: tdecore/klocale.cpp:2447
 msgid "&Next"
 msgstr "次(&N)"
 
-#: kdecore/netsupp.cpp:890 kdecore/network/kresolver.cpp:557
+#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
 msgid "no error"
 msgstr "エラーなし"
 
-#: kdecore/netsupp.cpp:891
+#: tdecore/netsupp.cpp:891
 msgid "address family for nodename not supported"
 msgstr "ノード名のアドレスファミリはサポートされていません"
 
-#: kdecore/netsupp.cpp:892 kdecore/network/kresolver.cpp:559
+#: tdecore/netsupp.cpp:892 tdecore/network/kresolver.cpp:559
 msgid "temporary failure in name resolution"
 msgstr "名前解決の一時的な失敗"
 
-#: kdecore/netsupp.cpp:893
+#: tdecore/netsupp.cpp:893
 msgid "invalid value for 'ai_flags'"
 msgstr "'ai_flags' に不正な値"
 
-#: kdecore/netsupp.cpp:894 kdecore/network/kresolver.cpp:560
+#: tdecore/netsupp.cpp:894 tdecore/network/kresolver.cpp:560
 msgid "non-recoverable failure in name resolution"
 msgstr "名前解決の修復不可能なエラー"
 
-#: kdecore/netsupp.cpp:895
+#: tdecore/netsupp.cpp:895
 msgid "'ai_family' not supported"
 msgstr "サポートされていない 'ai_family'"
 
-#: kdecore/netsupp.cpp:896 kdecore/network/kresolver.cpp:562
+#: tdecore/netsupp.cpp:896 tdecore/network/kresolver.cpp:562
 msgid "memory allocation failure"
 msgstr "メモリ割り当てに失敗"
 
-#: kdecore/netsupp.cpp:897
+#: tdecore/netsupp.cpp:897
 msgid "no address associated with nodename"
 msgstr "ノード名に関連付けられているアドレスはありません"
 
-#: kdecore/netsupp.cpp:898 kdecore/network/kresolver.cpp:563
+#: tdecore/netsupp.cpp:898 tdecore/network/kresolver.cpp:563
 msgid "name or service not known"
 msgstr "未知の名前またはサービス"
 
-#: kdecore/netsupp.cpp:899
+#: tdecore/netsupp.cpp:899
 msgid "servname not supported for ai_socktype"
 msgstr "ai_socktype でサポートされていないサーバ名"
 
-#: kdecore/netsupp.cpp:900
+#: tdecore/netsupp.cpp:900
 msgid "'ai_socktype' not supported"
 msgstr "サポートされていない 'ai_socktype'"
 
-#: kdecore/netsupp.cpp:901
+#: tdecore/netsupp.cpp:901
 msgid "system error"
 msgstr "システムエラー"
 
-#: kdecore/kcalendarsystemjalali.cpp:392
+#: tdecore/kcalendarsystemjalali.cpp:392
 msgid "Far"
 msgstr "Far"
 
-#: kdecore/kcalendarsystemjalali.cpp:394
+#: tdecore/kcalendarsystemjalali.cpp:394
 msgid "Ord"
 msgstr "Ord"
 
-#: kdecore/kcalendarsystemjalali.cpp:396
+#: tdecore/kcalendarsystemjalali.cpp:396
 msgid "Kho"
 msgstr "Kho"
 
-#: kdecore/kcalendarsystemjalali.cpp:398 kdecore/kcalendarsystemjalali.cpp:426
+#: tdecore/kcalendarsystemjalali.cpp:398 tdecore/kcalendarsystemjalali.cpp:426
 msgid "Tir"
 msgstr "Tir"
 
-#: kdecore/kcalendarsystemjalali.cpp:400
+#: tdecore/kcalendarsystemjalali.cpp:400
 msgid "Mor"
 msgstr "Mor"
 
-#: kdecore/kcalendarsystemjalali.cpp:402
+#: tdecore/kcalendarsystemjalali.cpp:402
 msgid "Sha"
 msgstr "Sha"
 
-#: kdecore/kcalendarsystemjalali.cpp:404
+#: tdecore/kcalendarsystemjalali.cpp:404
 msgid "Meh"
 msgstr "Meh"
 
-#: kdecore/kcalendarsystemjalali.cpp:406
+#: tdecore/kcalendarsystemjalali.cpp:406
 msgid "Aba"
 msgstr "Aba"
 
-#: kdecore/kcalendarsystemjalali.cpp:408
+#: tdecore/kcalendarsystemjalali.cpp:408
 msgid "Aza"
 msgstr "Aza"
 
-#: kdecore/kcalendarsystemjalali.cpp:410 kdecore/kcalendarsystemjalali.cpp:438
+#: tdecore/kcalendarsystemjalali.cpp:410 tdecore/kcalendarsystemjalali.cpp:438
 msgid "Dei"
 msgstr "Dei"
 
-#: kdecore/kcalendarsystemjalali.cpp:412
+#: tdecore/kcalendarsystemjalali.cpp:412
 msgid "Bah"
 msgstr "Bah"
 
-#: kdecore/kcalendarsystemjalali.cpp:414
+#: tdecore/kcalendarsystemjalali.cpp:414
 msgid "Esf"
 msgstr "Esf"
 
-#: kdecore/kcalendarsystemjalali.cpp:420
+#: tdecore/kcalendarsystemjalali.cpp:420
 msgid "Farvardin"
 msgstr "Farvardin"
 
-#: kdecore/kcalendarsystemjalali.cpp:422
+#: tdecore/kcalendarsystemjalali.cpp:422
 msgid "Ordibehesht"
 msgstr "Ordibehesht"
 
-#: kdecore/kcalendarsystemjalali.cpp:424
+#: tdecore/kcalendarsystemjalali.cpp:424
 msgid "Khordad"
 msgstr "Khordad"
 
-#: kdecore/kcalendarsystemjalali.cpp:428
+#: tdecore/kcalendarsystemjalali.cpp:428
 msgid "Mordad"
 msgstr "Mordad"
 
-#: kdecore/kcalendarsystemjalali.cpp:430
+#: tdecore/kcalendarsystemjalali.cpp:430
 msgid "Shahrivar"
 msgstr "Shahrivar"
 
-#: kdecore/kcalendarsystemjalali.cpp:432
+#: tdecore/kcalendarsystemjalali.cpp:432
 msgid "Mehr"
 msgstr "Mehr"
 
-#: kdecore/kcalendarsystemjalali.cpp:434
+#: tdecore/kcalendarsystemjalali.cpp:434
 msgid "Aban"
 msgstr "Aban"
 
-#: kdecore/kcalendarsystemjalali.cpp:436
+#: tdecore/kcalendarsystemjalali.cpp:436
 msgid "Azar"
 msgstr "Azar"
 
-#: kdecore/kcalendarsystemjalali.cpp:440
+#: tdecore/kcalendarsystemjalali.cpp:440
 msgid "Bahman"
 msgstr "Bahman"
 
-#: kdecore/kcalendarsystemjalali.cpp:442
+#: tdecore/kcalendarsystemjalali.cpp:442
 msgid "Esfand"
 msgstr "Esfand"
 
-#: kdecore/kcalendarsystemjalali.cpp:476
+#: tdecore/kcalendarsystemjalali.cpp:476
 msgid "2sh"
 msgstr "2sh"
 
-#: kdecore/kcalendarsystemjalali.cpp:478
+#: tdecore/kcalendarsystemjalali.cpp:478
 msgid "3sh"
 msgstr "3sh"
 
-#: kdecore/kcalendarsystemjalali.cpp:480
+#: tdecore/kcalendarsystemjalali.cpp:480
 msgid "4sh"
 msgstr "4sh"
 
-#: kdecore/kcalendarsystemjalali.cpp:482
+#: tdecore/kcalendarsystemjalali.cpp:482
 msgid "5sh"
 msgstr "5sh"
 
-#: kdecore/kcalendarsystemjalali.cpp:484
+#: tdecore/kcalendarsystemjalali.cpp:484
 msgid "Jom"
 msgstr "Jom"
 
-#: kdecore/kcalendarsystemjalali.cpp:486
+#: tdecore/kcalendarsystemjalali.cpp:486
 msgid "shn"
 msgstr "shn"
 
-#: kdecore/kcalendarsystemjalali.cpp:488
+#: tdecore/kcalendarsystemjalali.cpp:488
 msgid "1sh"
 msgstr "1sh"
 
-#: kdecore/kcalendarsystemjalali.cpp:494
+#: tdecore/kcalendarsystemjalali.cpp:494
 msgid "Do shanbe"
 msgstr "Do shanbe"
 
-#: kdecore/kcalendarsystemjalali.cpp:496
+#: tdecore/kcalendarsystemjalali.cpp:496
 msgid "Se shanbe"
 msgstr "Se shanbe"
 
-#: kdecore/kcalendarsystemjalali.cpp:498
+#: tdecore/kcalendarsystemjalali.cpp:498
 msgid "Chahar shanbe"
 msgstr "Chahar shanbe"
 
-#: kdecore/kcalendarsystemjalali.cpp:500
+#: tdecore/kcalendarsystemjalali.cpp:500
 msgid "Panj shanbe"
 msgstr "Panj shanbe"
 
-#: kdecore/kcalendarsystemjalali.cpp:502
+#: tdecore/kcalendarsystemjalali.cpp:502
 msgid "Jumee"
 msgstr "Jumee"
 
-#: kdecore/kcalendarsystemjalali.cpp:504
+#: tdecore/kcalendarsystemjalali.cpp:504
 msgid "Shanbe"
 msgstr "Shanbe"
 
-#: kdecore/kcalendarsystemjalali.cpp:506
+#: tdecore/kcalendarsystemjalali.cpp:506
 msgid "Yek-shanbe"
 msgstr "Yek-shanbe"
 
-#: kdecore/kkeyserver_x11.cpp:113
+#: tdecore/kkeyserver_x11.cpp:113
 msgid "Win"
 msgstr "Win"
 
-#: kdecore/kkeyserver_x11.cpp:119
+#: tdecore/kkeyserver_x11.cpp:119
 msgid "Backspace"
 msgstr "Backspace"
 
-#: kdecore/kkeyserver_x11.cpp:120
+#: tdecore/kkeyserver_x11.cpp:120
 msgid "SysReq"
 msgstr "SysReq"
 
-#: kdecore/kkeyserver_x11.cpp:121
+#: tdecore/kkeyserver_x11.cpp:121
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: kdecore/kkeyserver_x11.cpp:122
+#: tdecore/kkeyserver_x11.cpp:122
 msgid "NumLock"
 msgstr "NumLock"
 
-#: kdecore/kkeyserver_x11.cpp:123
+#: tdecore/kkeyserver_x11.cpp:123
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: kdecore/kkeyserver_x11.cpp:124
+#: tdecore/kkeyserver_x11.cpp:124
 msgid "PageUp"
 msgstr "PageUp"
 
-#: kdecore/kkeyserver_x11.cpp:125
+#: tdecore/kkeyserver_x11.cpp:125
 msgid "PageDown"
 msgstr "PageDown"
 
-#: kdecore/kkeyserver_x11.cpp:128
+#: tdecore/kkeyserver_x11.cpp:128
 msgid "Again"
 msgstr "再試行"
 
-#: kdecore/kkeyserver_x11.cpp:129
+#: tdecore/kkeyserver_x11.cpp:129
 msgid "Props"
 msgstr "Props"
 
-#: kdecore/kkeyserver_x11.cpp:131
+#: tdecore/kkeyserver_x11.cpp:131
 msgid "Front"
 msgstr "Front"
 
-#: kdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
+#: tdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: kdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
+#: tdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
 msgid "Baltic"
 msgstr "バルト諸語"
 
-#: kdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
+#: tdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
 msgid "Central European"
 msgstr "中央ヨーロッパ諸語"
 
-#: kdecore/kcharsets.cpp:47
+#: tdecore/kcharsets.cpp:47
 msgid "Chinese Simplified"
 msgstr "中国語簡字体"
 
-#: kdecore/kcharsets.cpp:48
+#: tdecore/kcharsets.cpp:48
 msgid "Chinese Traditional"
 msgstr "中国語繁字体"
 
-#: kdecore/kcharsets.cpp:49
+#: tdecore/kcharsets.cpp:49
 msgid "Cyrillic"
 msgstr "キリル文字"
 
-#: kdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
+#: tdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: kdecore/kcharsets.cpp:51 kdeui/ksconfig.cpp:235 kdeui/ksconfig.cpp:395
-#: kdeui/ksconfig.cpp:656 khtml/khtml_part.cpp:285
+#: tdecore/kcharsets.cpp:51 tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395
+#: tdeui/ksconfig.cpp:656 khtml/khtml_part.cpp:285
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
+#: tdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
 msgid "Japanese"
 msgstr "日本語"
 
-#: kdecore/kcharsets.cpp:53
+#: tdecore/kcharsets.cpp:53
 msgid "Korean"
 msgstr "韓国語・朝鮮語"
 
-#: kdecore/kcharsets.cpp:54
+#: tdecore/kcharsets.cpp:54
 msgid "Thai"
 msgstr "タイ語"
 
-#: kdecore/kcharsets.cpp:55 kdeui/ksconfig.cpp:240 kdeui/ksconfig.cpp:400
-#: kdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290
+#: tdecore/kcharsets.cpp:55 tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400
+#: tdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
+#: tdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
 msgid "Western European"
 msgstr "西ヨーロッパ諸語"
 
-#: kdecore/kcharsets.cpp:57
+#: tdecore/kcharsets.cpp:57
 msgid "Tamil"
 msgstr "タミル語"
 
-#: kdecore/kcharsets.cpp:58
+#: tdecore/kcharsets.cpp:58
 msgid "Unicode"
 msgstr "Unicode"
 
-#: kdecore/kcharsets.cpp:59
+#: tdecore/kcharsets.cpp:59
 msgid "Northern Saami"
 msgstr "北サーミ語"
 
-#: kdecore/kcharsets.cpp:60
+#: tdecore/kcharsets.cpp:60
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: kdecore/kcharsets.cpp:61
+#: tdecore/kcharsets.cpp:61
 msgid "South-Eastern Europe"
 msgstr "西ヨーロッパ諸語"
 
-#: kdecore/kcharsets.cpp:516
+#: tdecore/kcharsets.cpp:516
 msgid ""
 "_: Descriptive Encoding Name\n"
 "%1 ( %2 )"
 msgstr "%1 ( %2 )"
 
-#: kdecore/kglobalsettings.cpp:494
+#: tdecore/kglobalsettings.cpp:494
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: kdecore/kcompletion.cpp:632
+#: tdecore/kcompletion.cpp:632
 msgid ""
 "You reached the end of the list\n"
 "of matching items.\n"
@@ -4105,7 +4105,7 @@ msgstr ""
 "アイテム検索のリストの終端に\n"
 "達しました。\n"
 
-#: kdecore/kcompletion.cpp:638
+#: tdecore/kcompletion.cpp:638
 msgid ""
 "The completion is ambiguous, more than one\n"
 "match is available.\n"
@@ -4113,69 +4113,69 @@ msgstr ""
 "補完はあいまいです。\n"
 "マッチするものが二つ以上あります。\n"
 
-#: kdecore/kcompletion.cpp:644
+#: tdecore/kcompletion.cpp:644
 msgid ""
 "There is no matching item available.\n"
 msgstr ""
 "マッチするアイテムはありません。\n"
 
-#: kdecore/kcalendarsystemhebrew.cpp:402
+#: tdecore/kcalendarsystemhebrew.cpp:402
 msgid "Tishrey"
 msgstr "Tishrey"
 
-#: kdecore/kcalendarsystemhebrew.cpp:404
+#: tdecore/kcalendarsystemhebrew.cpp:404
 msgid "Heshvan"
 msgstr "Heshvan"
 
-#: kdecore/kcalendarsystemhebrew.cpp:406
+#: tdecore/kcalendarsystemhebrew.cpp:406
 msgid "Kislev"
 msgstr "Kislev"
 
-#: kdecore/kcalendarsystemhebrew.cpp:408
+#: tdecore/kcalendarsystemhebrew.cpp:408
 msgid "Tevet"
 msgstr "Tevet"
 
-#: kdecore/kcalendarsystemhebrew.cpp:410
+#: tdecore/kcalendarsystemhebrew.cpp:410
 msgid "Shvat"
 msgstr "Shvat"
 
-#: kdecore/kcalendarsystemhebrew.cpp:412
+#: tdecore/kcalendarsystemhebrew.cpp:412
 msgid "Adar"
 msgstr "Adar"
 
-#: kdecore/kcalendarsystemhebrew.cpp:414
+#: tdecore/kcalendarsystemhebrew.cpp:414
 msgid "Nisan"
 msgstr "Nisan"
 
-#: kdecore/kcalendarsystemhebrew.cpp:416
+#: tdecore/kcalendarsystemhebrew.cpp:416
 msgid "Iyar"
 msgstr "Iyar"
 
-#: kdecore/kcalendarsystemhebrew.cpp:418
+#: tdecore/kcalendarsystemhebrew.cpp:418
 msgid "Sivan"
 msgstr "Sivan"
 
-#: kdecore/kcalendarsystemhebrew.cpp:420
+#: tdecore/kcalendarsystemhebrew.cpp:420
 msgid "Tamuz"
 msgstr "Tamuz"
 
-#: kdecore/kcalendarsystemhebrew.cpp:422
+#: tdecore/kcalendarsystemhebrew.cpp:422
 msgid "Av"
 msgstr "Av"
 
-#: kdecore/kcalendarsystemhebrew.cpp:424
+#: tdecore/kcalendarsystemhebrew.cpp:424
 msgid "Elul"
 msgstr "Elul"
 
-#: kdecore/kcalendarsystemhebrew.cpp:426
+#: tdecore/kcalendarsystemhebrew.cpp:426
 msgid "Adar I"
 msgstr "Adar I"
 
-#: kdecore/kcalendarsystemhebrew.cpp:428
+#: tdecore/kcalendarsystemhebrew.cpp:428
 msgid "Adar II"
 msgstr "Adar II"
 
-#: kdecore/kaboutdata.cpp:388
+#: tdecore/kaboutdata.cpp:388
 msgid ""
 "_: replace this with information about your translation team\n"
 "<p>KDE is translated into many languages thanks to the work of the translation "
@@ -4188,7 +4188,7 @@ msgstr ""
 "をご覧ください。</p>"
 "<p>日本語チームについては、http://www.kde.gr.jp を参照してください。</p>"
 
-#: kdecore/kaboutdata.cpp:444
+#: tdecore/kaboutdata.cpp:444
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4197,213 +4197,213 @@ msgstr ""
 "このプログラムのライセンスについては、\n"
 "ドキュメントまたはソースを確認してください。\n"
 
-#: kdecore/kaboutdata.cpp:451
+#: tdecore/kaboutdata.cpp:451
 #, c-format
 msgid "This program is distributed under the terms of the %1."
 msgstr "このプログラムは %1 のもとで配布されています。"
 
-#: kdecore/kcalendarsystem.cpp:124
+#: tdecore/kcalendarsystem.cpp:124
 msgid ""
 "_: Monday\n"
 "Mon"
 msgstr "月"
 
-#: kdecore/kcalendarsystem.cpp:125
+#: tdecore/kcalendarsystem.cpp:125
 msgid ""
 "_: Tuesday\n"
 "Tue"
 msgstr "火"
 
-#: kdecore/kcalendarsystem.cpp:126
+#: tdecore/kcalendarsystem.cpp:126
 msgid ""
 "_: Wednesday\n"
 "Wed"
 msgstr "水"
 
-#: kdecore/kcalendarsystem.cpp:127
+#: tdecore/kcalendarsystem.cpp:127
 msgid ""
 "_: Thursday\n"
 "Thu"
 msgstr "木"
 
-#: kdecore/kcalendarsystem.cpp:128
+#: tdecore/kcalendarsystem.cpp:128
 msgid ""
 "_: Friday\n"
 "Fri"
 msgstr "金"
 
-#: kdecore/kcalendarsystem.cpp:129
+#: tdecore/kcalendarsystem.cpp:129
 msgid ""
 "_: Saturday\n"
 "Sat"
 msgstr "土"
 
-#: kdecore/kcalendarsystem.cpp:130
+#: tdecore/kcalendarsystem.cpp:130
 msgid ""
 "_: Sunday\n"
 "Sun"
 msgstr "日"
 
-#: kdecore/ksocks.cpp:135
+#: tdecore/ksocks.cpp:135
 msgid "NEC SOCKS client"
 msgstr "NEC SOCKS クライアント"
 
-#: kdecore/ksocks.cpp:170
+#: tdecore/ksocks.cpp:170
 msgid "Dante SOCKS client"
 msgstr "Dante SOCKS クライアント"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:45
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:45
 msgid "Directory to generate files in"
 msgstr "ファイル作成先のディレクトリ"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:46
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:46
 msgid "Input kcfg XML file"
 msgstr "kcfg XML 入力ファイル"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:47
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:47
 msgid "Code generation options file"
 msgstr "コード生成オプションファイル"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:955
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:955
 msgid "KDE .kcfg compiler"
 msgstr "KDE kcfg コンパイラ"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:956
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:956
 msgid "KConfig Compiler"
 msgstr "KConfig コンパイラ"
 
-#: kdecore/network/kresolver.cpp:558
+#: tdecore/network/kresolver.cpp:558
 msgid "requested family not supported for this host name"
 msgstr "要求されたファミリはこのホスト名でサポートしていません"
 
-#: kdecore/network/kresolver.cpp:561
+#: tdecore/network/kresolver.cpp:561
 msgid "invalid flags"
 msgstr "無効なフラグ"
 
-#: kdecore/network/kresolver.cpp:564
+#: tdecore/network/kresolver.cpp:564
 msgid "requested family not supported"
 msgstr "要求されたファミリはサポートしていません"
 
-#: kdecore/network/kresolver.cpp:565
+#: tdecore/network/kresolver.cpp:565
 msgid "requested service not supported for this socket type"
 msgstr "要求されたサービスはこのソケットタイプをサポートしていません"
 
-#: kdecore/network/kresolver.cpp:566
+#: tdecore/network/kresolver.cpp:566
 msgid "requested socket type not supported"
 msgstr "要求されたサービスはサポートしていません"
 
-#: kdecore/network/kresolver.cpp:567
+#: tdecore/network/kresolver.cpp:567
 msgid "unknown error"
 msgstr "未知のエラー"
 
-#: kdecore/network/kresolver.cpp:569
+#: tdecore/network/kresolver.cpp:569
 #, c-format
 msgid ""
 "_: 1: the i18n'ed system error code, from errno\n"
 "system error: %1"
 msgstr "システムエラー :%1"
 
-#: kdecore/network/kresolver.cpp:574
+#: tdecore/network/kresolver.cpp:574
 msgid "request was canceled"
 msgstr "要求はキャンセルされました"
 
-#: kdecore/network/ksocketbase.cpp:172
+#: tdecore/network/ksocketbase.cpp:172
 msgid ""
 "_: Socket error code NoError\n"
 "no error"
 msgstr "エラーなし"
 
-#: kdecore/network/ksocketbase.cpp:177
+#: tdecore/network/ksocketbase.cpp:177
 msgid ""
 "_: Socket error code LookupFailure\n"
 "name lookup has failed"
 msgstr "名前検索は失敗しました"
 
-#: kdecore/network/ksocketbase.cpp:182
+#: tdecore/network/ksocketbase.cpp:182
 msgid ""
 "_: Socket error code AddressInUse\n"
 "address already in use"
 msgstr "アドレスは既に使用されています"
 
-#: kdecore/network/ksocketbase.cpp:187
+#: tdecore/network/ksocketbase.cpp:187
 msgid ""
 "_: Socket error code AlreadyBound\n"
 "socket is already bound"
 msgstr "ソケットは既にバインドされています"
 
-#: kdecore/network/ksocketbase.cpp:192
+#: tdecore/network/ksocketbase.cpp:192
 msgid ""
 "_: Socket error code AlreadyCreated\n"
 "socket is already created"
 msgstr "ソケットは既に作成されています"
 
-#: kdecore/network/ksocketbase.cpp:197
+#: tdecore/network/ksocketbase.cpp:197
 msgid ""
 "_: Socket error code NotBound\n"
 "socket is not bound"
 msgstr "ソケットはバインドされていません"
 
-#: kdecore/network/ksocketbase.cpp:202
+#: tdecore/network/ksocketbase.cpp:202
 msgid ""
 "_: Socket error code NotCreated\n"
 "socket has not been created"
 msgstr "ソケットは作成されていません"
 
-#: kdecore/network/ksocketbase.cpp:207
+#: tdecore/network/ksocketbase.cpp:207
 msgid ""
 "_: Socket error code WouldBlock\n"
 "operation would block"
 msgstr "操作がブロックされます"
 
-#: kdecore/network/ksocketbase.cpp:212
+#: tdecore/network/ksocketbase.cpp:212
 msgid ""
 "_: Socket error code ConnectionRefused\n"
 "connection actively refused"
 msgstr "接続は積極的に拒否されました"
 
-#: kdecore/network/ksocketbase.cpp:217
+#: tdecore/network/ksocketbase.cpp:217
 msgid ""
 "_: Socket error code ConnectionTimedOut\n"
 "connection timed out"
 msgstr "接続タイムアウト"
 
-#: kdecore/network/ksocketbase.cpp:222
+#: tdecore/network/ksocketbase.cpp:222
 msgid ""
 "_: Socket error code InProgress\n"
 "operation is already in progress"
 msgstr "操作は既に実行中です"
 
-#: kdecore/network/ksocketbase.cpp:227
+#: tdecore/network/ksocketbase.cpp:227
 msgid ""
 "_: Socket error code NetFailure\n"
 "network failure occurred"
 msgstr "ネットワークトラブルが発生しました"
 
-#: kdecore/network/ksocketbase.cpp:232
+#: tdecore/network/ksocketbase.cpp:232
 msgid ""
 "_: Socket error code NotSupported\n"
 "operation is not supported"
 msgstr "操作はサポートされていません"
 
-#: kdecore/network/ksocketbase.cpp:237
+#: tdecore/network/ksocketbase.cpp:237
 msgid ""
 "_: Socket error code Timeout\n"
 "timed operation timed out"
 msgstr "操作はタイムアウトしました"
 
-#: kdecore/network/ksocketbase.cpp:242
+#: tdecore/network/ksocketbase.cpp:242
 msgid ""
 "_: Socket error code UnknownError\n"
 "an unknown/unexpected error has happened"
 msgstr "未知の/予期しないエラーが発生しました"
 
-#: kdecore/network/ksocketbase.cpp:247
+#: tdecore/network/ksocketbase.cpp:247
 msgid ""
 "_: Socket error code RemotelyDisconnected\n"
 "remote host closed connection"
 msgstr "リモートホストは接続を閉じました"
 
-#: kdecore/network/ksocketaddress.cpp:625
+#: tdecore/network/ksocketaddress.cpp:625
 #, c-format
 msgid ""
 "_: 1: the unknown socket address family number\n"
@@ -4414,7 +4414,7 @@ msgstr "未知のファミリ %1"
 msgid "Share Hot New Stuff"
 msgstr "ホットな新しいものを共有"
 
-#: kdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
+#: tdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
 #: kresources/configdialog.cpp:53
 msgid "Name:"
 msgstr "名前:"
@@ -4427,7 +4427,7 @@ msgstr "作者:"
 msgid "Email:"
 msgstr "Eメール:"
 
-#: kdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
+#: tdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
 msgid "Version:"
 msgstr "バージョン:"
 
@@ -4533,7 +4533,7 @@ msgstr "リリース日"
 msgid "Install"
 msgstr "インストール"
 
-#: kdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
+#: tdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
 #: knewstuff/downloaddialog.cpp:505
 msgid "Details"
 msgstr "詳細"
@@ -4806,21 +4806,21 @@ msgstr "下のリストからプロバイダを一つ選択してください:"
 msgid "No provider selected."
 msgstr "プロバイダが選択されていません。"
 
-#: kdeui/kkeydialog.cpp:321
+#: tdeui/kkeydialog.cpp:321
 msgid "Clear Search"
 msgstr "検索をクリア"
 
-#: kdeui/kkeydialog.cpp:324
+#: tdeui/kkeydialog.cpp:324
 msgid "&Search:"
 msgstr "検索(&S):"
 
-#: kdeui/kkeydialog.cpp:331
+#: tdeui/kkeydialog.cpp:331
 msgid ""
 "Search interactively for shortcut names (e.g. Copy) or combination of keys "
 "(e.g. Ctrl+C) by typing them here."
 msgstr "ここにショートカットの名前 (例 コピー) またはキーの組合せ (例 Ctrl+C) を入力してインタラクティブに検索することができます。"
 
-#: kdeui/kkeydialog.cpp:354
+#: tdeui/kkeydialog.cpp:354
 msgid ""
 "Here you can see a list of key bindings, i.e. associations between actions "
 "(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
@@ -4829,55 +4829,55 @@ msgstr ""
 "キーボードショートカットの一覧です。左の列がアクション (例 コピー)、右の列がそのアクションに割り当てられているキーまたはキーの組合せ (例 Ctrl+C) "
 "です。"
 
-#: kdeui/kkeydialog.cpp:363
+#: tdeui/kkeydialog.cpp:363
 msgid "Action"
 msgstr "アクション"
 
-#: kdeui/kkeydialog.cpp:364
+#: tdeui/kkeydialog.cpp:364
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: kdeui/kkeydialog.cpp:365
+#: tdeui/kkeydialog.cpp:365
 msgid "Alternate"
 msgstr "第二ショートカット"
 
-#: kdeui/kkeydialog.cpp:380
+#: tdeui/kkeydialog.cpp:380
 msgid "Shortcut for Selected Action"
 msgstr "選択されたアクションのためのショートカット"
 
-#: kdeui/kkeydialog.cpp:393
+#: tdeui/kkeydialog.cpp:393
 msgid ""
 "_: no key\n"
 "&None"
 msgstr "なし(&N)"
 
-#: kdeui/kkeydialog.cpp:398
+#: tdeui/kkeydialog.cpp:398
 msgid "The selected action will not be associated with any key."
 msgstr "選択したアクションにキーを割り当てません。"
 
-#: kdeui/kkeydialog.cpp:401
+#: tdeui/kkeydialog.cpp:401
 msgid ""
 "_: default key\n"
 "De&fault"
 msgstr "標準(&F)"
 
-#: kdeui/kkeydialog.cpp:406
+#: tdeui/kkeydialog.cpp:406
 msgid ""
 "This will bind the default key to the selected action. Usually a reasonable "
 "choice."
 msgstr "選択したアクションに標準のキーを割り当てます。通常、これは好ましい選択です。"
 
-#: kdeui/kkeydialog.cpp:409
+#: tdeui/kkeydialog.cpp:409
 msgid "C&ustom"
 msgstr "カスタム(&U)"
 
-#: kdeui/kkeydialog.cpp:414
+#: tdeui/kkeydialog.cpp:414
 msgid ""
 "If this option is selected you can create a customized key binding for the "
 "selected action using the buttons below."
 msgstr "このオプションを選択すると、右のボタンを使って選択したアクションのキー割り当てをカスタマイズすることができます。"
 
-#: kdeui/kkeydialog.cpp:428
+#: tdeui/kkeydialog.cpp:428
 msgid ""
 "Use this button to choose a new shortcut key. Once you click it, you can press "
 "the key-combination which you would like to be assigned to the currently "
@@ -4885,29 +4885,29 @@ msgid ""
 msgstr ""
 "新しくショートカットキーを設定するには、このボタンを使用してください。クリックした後に現在選択されているアクションに割り当てるキーの組合せを押します。"
 
-#: kdeui/kkeydialog.cpp:470
+#: tdeui/kkeydialog.cpp:470
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: kdeui/kkeydialog.cpp:536
+#: tdeui/kkeydialog.cpp:536
 msgid "Default key:"
 msgstr "標準キー:"
 
-#: kdeui/kkeybutton.cpp:89 kdeui/kkeydialog.cpp:536 kdeui/klineedit.cpp:889
+#: tdeui/kkeybutton.cpp:89 tdeui/kkeydialog.cpp:536 tdeui/klineedit.cpp:889
 msgid "None"
 msgstr "なし"
 
-#: kdeui/kkeydialog.cpp:715
+#: tdeui/kkeydialog.cpp:715
 msgid ""
 "In order to use the '%1' key as a shortcut, it must be combined with the Win, "
 "Alt, Ctrl, and/or Shift keys."
 msgstr "キー '%1' をショートカットとして使用するには、Meta, Alt, Ctrl, Shift キーと組み合わせなければなりません。"
 
-#: kdeui/kkeydialog.cpp:718
+#: tdeui/kkeydialog.cpp:718
 msgid "Invalid Shortcut Key"
 msgstr "無効なショートカットキー"
 
-#: kdeui/kkeydialog.cpp:943
+#: tdeui/kkeydialog.cpp:943
 msgid ""
 "The '%1' key combination has already been allocated to the \"%2\" action.\n"
 "Please choose a unique key combination."
@@ -4915,11 +4915,11 @@ msgstr ""
 "キーの組み合わせ '%1' はアクション「%2」に割り当て済みです。\n"
 "競合しないキーの組み合わせを選択してください。"
 
-#: kdeui/kkeydialog.cpp:958
+#: tdeui/kkeydialog.cpp:958
 msgid "Conflict with Standard Application Shortcut"
 msgstr "標準アプリケーションショートカットと競合します"
 
-#: kdeui/kkeydialog.cpp:959
+#: tdeui/kkeydialog.cpp:959
 msgid ""
 "The '%1' key combination has already been allocated to the standard action "
 "\"%2\".\n"
@@ -4928,11 +4928,11 @@ msgstr ""
 "キーの組み合わせ '%1' は標準アクション「%2」に割り当て済みです。\n"
 "現在のアクションに割り当て直しますか？"
 
-#: kdeui/kkeydialog.cpp:964
+#: tdeui/kkeydialog.cpp:964
 msgid "Conflict with Global Shortcut"
 msgstr "グローバルショートカットと競合します"
 
-#: kdeui/kkeydialog.cpp:965
+#: tdeui/kkeydialog.cpp:965
 msgid ""
 "The '%1' key combination has already been allocated to the global action "
 "\"%2\".\n"
@@ -4941,11 +4941,11 @@ msgstr ""
 "キーの組み合わせ '%1' はグローバルアクション「%2」に割り当て済みです。\n"
 "現在のアクションに割り当て直しますか？"
 
-#: kdeui/kkeydialog.cpp:970
+#: tdeui/kkeydialog.cpp:970
 msgid "Key Conflict"
 msgstr "キー競合"
 
-#: kdeui/kkeydialog.cpp:971
+#: tdeui/kkeydialog.cpp:971
 msgid ""
 "The '%1' key combination has already been allocated to the \"%2\" action.\n"
 "Do you want to reassign it from that action to the current one?"
@@ -4953,251 +4953,251 @@ msgstr ""
 "キーの組み合わせ '%1' はアクション「%2」に割り当て済みです。\n"
 "現在のアクションに割り当て直しますか？"
 
-#: kdeui/kkeydialog.cpp:977
+#: tdeui/kkeydialog.cpp:977
 msgid "Reassign"
 msgstr "割り当て直す"
 
-#: kdeui/kkeydialog.cpp:1091 kdeui/kkeydialog.cpp:1103
+#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
 msgid "Configure Shortcuts"
 msgstr "ショートカットを設定"
 
-#: kdeui/ktabbar.cpp:196
+#: tdeui/ktabbar.cpp:196
 msgid "Close this tab"
 msgstr "このタブを閉じる"
 
-#: kdeui/kpixmapregionselectordialog.cpp:28
+#: tdeui/kpixmapregionselectordialog.cpp:28
 msgid "Select Region of Image"
 msgstr "画像の領域を選択"
 
-#: kdeui/kpixmapregionselectordialog.cpp:31
+#: tdeui/kpixmapregionselectordialog.cpp:31
 msgid "Please click and drag on the image to select the region of interest:"
 msgstr "画像の上でクリック&ドラッグして、必要な領域を選択してください:"
 
-#: kdeui/kswitchlanguagedialog.cpp:90
+#: tdeui/kswitchlanguagedialog.cpp:90
 msgid "Switch application language"
 msgstr "アプリケーションの言語を切り替え"
 
-#: kdeui/kswitchlanguagedialog.cpp:96
+#: tdeui/kswitchlanguagedialog.cpp:96
 msgid "Please choose language which should be used for this application"
 msgstr "このアプリケーションに使用する言語を選択してください"
 
-#: kdeui/kswitchlanguagedialog.cpp:123
+#: tdeui/kswitchlanguagedialog.cpp:123
 msgid "Add fallback language"
 msgstr "フォールバック言語を追加"
 
-#: kdeui/kswitchlanguagedialog.cpp:124
+#: tdeui/kswitchlanguagedialog.cpp:124
 msgid ""
 "Adds one more language which will be used if other translations do not contain "
 "proper translation"
 msgstr "他の言語に適切な翻訳がない場合に使用する言語をもう一つ追加します。"
 
-#: kdeui/kswitchlanguagedialog.cpp:222
+#: tdeui/kswitchlanguagedialog.cpp:222
 msgid ""
 "Language for this application has been changed. The change will take effect "
 "upon next start of application"
 msgstr "このアプリケーションの言語が変更されました。変更はアプリケーションの次回起動時に有効になります。"
 
-#: kdeui/kswitchlanguagedialog.cpp:223
+#: tdeui/kswitchlanguagedialog.cpp:223
 msgid "Application language changed"
 msgstr "アプリケーションの言語が変更されました"
 
-#: kdeui/kswitchlanguagedialog.cpp:282
+#: tdeui/kswitchlanguagedialog.cpp:282
 msgid "Primary language:"
 msgstr "一次言語:"
 
-#: kdeui/kswitchlanguagedialog.cpp:282
+#: tdeui/kswitchlanguagedialog.cpp:282
 msgid "Fallback language:"
 msgstr "フォールバック言語:"
 
-#: kdeui/kswitchlanguagedialog.cpp:316
+#: tdeui/kswitchlanguagedialog.cpp:316
 msgid ""
 "This is main application language which will be used first before any other "
 "languages"
 msgstr "他のどの言語よりも優先してアプリケーションに使用する言語です。"
 
-#: kdeui/kswitchlanguagedialog.cpp:320
+#: tdeui/kswitchlanguagedialog.cpp:320
 msgid ""
 "This is language which will be used if any previous languages does not contain "
 "proper translation"
 msgstr "前のどの言語にも適切な翻訳がない場合に使用する言語です。"
 
-#: kdeui/ksconfig.cpp:102
+#: tdeui/ksconfig.cpp:102
 msgid "Create &root/affix combinations not in dictionary"
 msgstr "辞書にない語根/接辞の組合せを生成する(&R)"
 
-#: kdeui/ksconfig.cpp:107
+#: tdeui/ksconfig.cpp:107
 msgid "Consider run-together &words as spelling errors"
 msgstr "連結された語をスペル間違いと見なす(&W)"
 
-#: kdeui/ksconfig.cpp:118
+#: tdeui/ksconfig.cpp:118
 msgid "&Dictionary:"
 msgstr "辞書(&D):"
 
-#: kdeui/ksconfig.cpp:143
+#: tdeui/ksconfig.cpp:143
 msgid "&Encoding:"
 msgstr "エンコーディング(&E):"
 
-#: kdeui/ksconfig.cpp:148
+#: tdeui/ksconfig.cpp:148
 msgid "International Ispell"
 msgstr "国際化 Ispell"
 
-#: kdeui/ksconfig.cpp:149
+#: tdeui/ksconfig.cpp:149
 msgid "Aspell"
 msgstr "Aspell"
 
-#: kdeui/ksconfig.cpp:150
+#: tdeui/ksconfig.cpp:150
 msgid "Hspell"
 msgstr "Hspell"
 
-#: kdeui/ksconfig.cpp:151
+#: tdeui/ksconfig.cpp:151
 msgid "Zemberek"
 msgstr "Zemberek"
 
-#: kdeui/ksconfig.cpp:156
+#: tdeui/ksconfig.cpp:156
 msgid "&Client:"
 msgstr "クライアント(&C):"
 
-#: kdeui/ksconfig.cpp:297
+#: tdeui/ksconfig.cpp:297
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: kdeui/ksconfig.cpp:300
+#: tdeui/ksconfig.cpp:300
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: kdeui/ksconfig.cpp:303
+#: tdeui/ksconfig.cpp:303
 msgid "German"
 msgstr "ドイツ語"
 
-#: kdeui/ksconfig.cpp:306
+#: tdeui/ksconfig.cpp:306
 msgid "German (new spelling)"
 msgstr "ドイツ語 (new spelling)"
 
-#: kdeui/ksconfig.cpp:309
+#: tdeui/ksconfig.cpp:309
 msgid "Brazilian Portuguese"
 msgstr "ブラジル系ポルトガル語"
 
-#: kdeui/ksconfig.cpp:312
+#: tdeui/ksconfig.cpp:312
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: kdeui/ksconfig.cpp:315
+#: tdeui/ksconfig.cpp:315
 msgid "Esperanto"
 msgstr "エスペラント語"
 
-#: kdeui/ksconfig.cpp:318
+#: tdeui/ksconfig.cpp:318
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: kdeui/ksconfig.cpp:321
+#: tdeui/ksconfig.cpp:321
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: kdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
+#: tdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
 msgid "Russian"
 msgstr "ロシア語"
 
-#: kdeui/ksconfig.cpp:327
+#: tdeui/ksconfig.cpp:327
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: kdeui/ksconfig.cpp:330
+#: tdeui/ksconfig.cpp:330
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: kdeui/ksconfig.cpp:333
+#: tdeui/ksconfig.cpp:333
 msgid "Czech"
 msgstr "チェコ語"
 
-#: kdeui/ksconfig.cpp:336
+#: tdeui/ksconfig.cpp:336
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: kdeui/ksconfig.cpp:339
+#: tdeui/ksconfig.cpp:339
 msgid "Swiss German"
 msgstr "スイス ドイツ語"
 
-#: kdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
+#: tdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: kdeui/ksconfig.cpp:345
+#: tdeui/ksconfig.cpp:345
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: kdeui/ksconfig.cpp:348
+#: tdeui/ksconfig.cpp:348
 msgid "French"
 msgstr "フランス語"
 
-#: kdeui/ksconfig.cpp:351
+#: tdeui/ksconfig.cpp:351
 msgid "Belarusian"
 msgstr "ベラルーシ語"
 
-#: kdeui/ksconfig.cpp:354
+#: tdeui/ksconfig.cpp:354
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: kdeui/ksconfig.cpp:358
+#: tdeui/ksconfig.cpp:358
 msgid ""
 "_: Unknown ispell dictionary\n"
 "Unknown"
 msgstr "不明"
 
-#: kdeui/ksconfig.cpp:440 kdeui/ksconfig.cpp:594
+#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
 msgid "ISpell Default"
 msgstr "ISpell 標準"
 
-#: kdeui/ksconfig.cpp:488 kdeui/ksconfig.cpp:642
+#: tdeui/ksconfig.cpp:488 tdeui/ksconfig.cpp:642
 msgid ""
 "_: default spelling dictionary\n"
 "Default - %1 [%2]"
 msgstr "標準 - %1 [%2]"
 
-#: kdeui/ksconfig.cpp:508 kdeui/ksconfig.cpp:668
+#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
 msgid "ASpell Default"
 msgstr "ASpell 標準"
 
-#: kdeui/ksconfig.cpp:573 kdeui/ksconfig.cpp:733
+#: tdeui/ksconfig.cpp:573 tdeui/ksconfig.cpp:733
 #, c-format
 msgid ""
 "_: default spelling dictionary\n"
 "Default - %1"
 msgstr "標準 - %1"
 
-#: kdeui/kfontrequester.cpp:38
+#: tdeui/kfontrequester.cpp:38
 msgid "Choose..."
 msgstr "選択..."
 
-#: kdeui/kfontrequester.cpp:102
+#: tdeui/kfontrequester.cpp:102
 msgid "Click to select a font"
 msgstr "クリックしてフォントを選択"
 
-#: kdeui/kfontrequester.cpp:109
+#: tdeui/kfontrequester.cpp:109
 msgid "Preview of the selected font"
 msgstr "選択されたフォントのプレビュー"
 
-#: kdeui/kfontrequester.cpp:111
+#: tdeui/kfontrequester.cpp:111
 msgid ""
 "This is a preview of the selected font. You can change it by clicking the "
 "\"Choose...\" button."
 msgstr "これは選択されたフォントのプレビューです。「選択...」ボタンをクリックして変更できます。"
 
-#: kdeui/kfontrequester.cpp:117
+#: tdeui/kfontrequester.cpp:117
 msgid "Preview of the \"%1\" font"
 msgstr "「%1」フォントのプレビュー"
 
-#: kdeui/kfontrequester.cpp:119
+#: tdeui/kfontrequester.cpp:119
 msgid ""
 "This is a preview of the \"%1\" font. You can change it by clicking the "
 "\"Choose...\" button."
 msgstr "これは「%1」フォントのプレビューです。「選択...」ボタンをクリックして変更できます。"
 
 #. i18n "??" is displayed as (pseudo-)version when no data is known about the application
-#: kdeui/kaboutapplication.cpp:63
+#: tdeui/kaboutapplication.cpp:63
 msgid "??"
 msgstr "??"
 
-#: kdeui/kaboutapplication.cpp:67
+#: tdeui/kaboutapplication.cpp:67
 msgid ""
 "No information available.\n"
 "The supplied KAboutData object does not exist."
@@ -5205,122 +5205,122 @@ msgstr ""
 "情報はありません。\n"
 "KAboutData オブジェクトが存在しません。"
 
-#: kdeui/kaboutapplication.cpp:107
+#: tdeui/kaboutapplication.cpp:107
 msgid "A&uthor"
 msgstr "作者(&U)"
 
-#: kdeui/kaboutapplication.cpp:107
+#: tdeui/kaboutapplication.cpp:107
 msgid "A&uthors"
 msgstr "作者(&U)"
 
-#: kdeui/kaboutapplication.cpp:117
+#: tdeui/kaboutapplication.cpp:117
 msgid ""
 "Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
 "to report bugs.\n"
 msgstr ""
 "バグは <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> へ報告してください。\n"
 
-#: kdeui/kaboutapplication.cpp:121 kdeui/kaboutapplication.cpp:124
+#: tdeui/kaboutapplication.cpp:121 tdeui/kaboutapplication.cpp:124
 msgid ""
 "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
 msgstr ""
 "バグは <a href=\"mailto:%1\">%2</a> へ報告してください。\n"
 
-#: kdeui/kaboutapplication.cpp:149
+#: tdeui/kaboutapplication.cpp:149
 msgid "&Thanks To"
 msgstr "&Thanks To"
 
-#: kdeui/kaboutapplication.cpp:176
+#: tdeui/kaboutapplication.cpp:176
 msgid "T&ranslation"
 msgstr "翻訳(&R)"
 
-#: kdeui/kaboutapplication.cpp:181
+#: tdeui/kaboutapplication.cpp:181
 msgid "&License Agreement"
 msgstr "ライセンス(&L)"
 
-#: kdeui/kfontdialog.cpp:101
+#: tdeui/kfontdialog.cpp:101
 msgid "Here you can choose the font to be used."
 msgstr "ここで使用するフォントを選択します。"
 
-#: kdeui/kfontdialog.cpp:113
+#: tdeui/kfontdialog.cpp:113
 msgid "Requested Font"
 msgstr "使用するフォント"
 
-#: kdeui/kfontdialog.cpp:136
+#: tdeui/kfontdialog.cpp:136
 msgid "Change font family?"
 msgstr "フォントファミリを変更しますか？"
 
-#: kdeui/kfontdialog.cpp:138
+#: tdeui/kfontdialog.cpp:138
 msgid "Enable this checkbox to change the font family settings."
 msgstr "フォントファミリの設定を変更するには、このボックスにチェックを入れてください。"
 
-#: kdeui/kcharselect.cpp:383 kdeui/kfontdialog.cpp:144
+#: tdeui/kcharselect.cpp:383 tdeui/kfontdialog.cpp:144
 msgid "Font:"
 msgstr "フォント:"
 
-#: kdeui/kfontdialog.cpp:151
+#: tdeui/kfontdialog.cpp:151
 msgid "Font style"
 msgstr "フォントスタイル"
 
-#: kdeui/kfontdialog.cpp:155
+#: tdeui/kfontdialog.cpp:155
 msgid "Change font style?"
 msgstr "フォントスタイルを変更しますか？"
 
-#: kdeui/kfontdialog.cpp:157
+#: tdeui/kfontdialog.cpp:157
 msgid "Enable this checkbox to change the font style settings."
 msgstr "フォントスタイルの設定を変更するには、このボックスにチェックを入れてください。"
 
-#: kdeui/kfontdialog.cpp:163
+#: tdeui/kfontdialog.cpp:163
 msgid "Font style:"
 msgstr "フォントスタイル:"
 
-#: kdeui/kfontdialog.cpp:171
+#: tdeui/kfontdialog.cpp:171
 msgid "Size"
 msgstr "サイズ"
 
-#: kdeui/kfontdialog.cpp:175
+#: tdeui/kfontdialog.cpp:175
 msgid "Change font size?"
 msgstr "フォントサイズを変更しますか？"
 
-#: kdeui/kfontdialog.cpp:177
+#: tdeui/kfontdialog.cpp:177
 msgid "Enable this checkbox to change the font size settings."
 msgstr "フォントサイズの設定を変更するには、このボックスにチェックを入れてください。"
 
-#: kdeui/kfontdialog.cpp:183
+#: tdeui/kfontdialog.cpp:183
 msgid "Size:"
 msgstr "サイズ:"
 
-#: kdeui/kfontdialog.cpp:199
+#: tdeui/kfontdialog.cpp:199
 msgid "Here you can choose the font family to be used."
 msgstr "ここで使用するフォントファミリを選択します。"
 
-#: kdeui/kfontdialog.cpp:221
+#: tdeui/kfontdialog.cpp:221
 msgid "Here you can choose the font style to be used."
 msgstr "ここで使用するフォントスタイルを選択します。"
 
-#: kdeui/kfontdialog.cpp:224 kdeui/kfontdialog.cpp:473
-#: kdeui/kfontdialog.cpp:475 kdeui/kfontdialog.cpp:484
-#: kdeui/kfontdialog.cpp:485
+#: tdeui/kfontdialog.cpp:224 tdeui/kfontdialog.cpp:473
+#: tdeui/kfontdialog.cpp:475 tdeui/kfontdialog.cpp:484
+#: tdeui/kfontdialog.cpp:485
 msgid "Regular"
 msgstr "標準"
 
-#: kdeui/kfontdialog.cpp:226
+#: tdeui/kfontdialog.cpp:226
 msgid "Bold"
 msgstr "ボールド"
 
-#: kdeui/kfontdialog.cpp:227
+#: tdeui/kfontdialog.cpp:227
 msgid "Bold Italic"
 msgstr "ボールドイタリック"
 
-#: kdeui/kfontdialog.cpp:244
+#: tdeui/kfontdialog.cpp:244
 msgid "Relative"
 msgstr "相対的"
 
-#: kdeui/kfontdialog.cpp:246
+#: tdeui/kfontdialog.cpp:246
 msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
 msgstr "フォントサイズ<br>環境に対して<br>「固定」か「相対的」か"
 
-#: kdeui/kfontdialog.cpp:248
+#: tdeui/kfontdialog.cpp:248
 msgid ""
 "Here you can switch between fixed font size and font size to be calculated "
 "dynamically and adjusted to changing environment (e.g. widget dimensions, paper "
@@ -5328,34 +5328,34 @@ msgid ""
 msgstr ""
 "固定フォントサイズと、環境の変化 (ウィジェットの大きさ、紙のサイズなど) に応じて動的に計算・調整されるフォントサイズを切り替えることができます。"
 
-#: kdeui/kfontdialog.cpp:272
+#: tdeui/kfontdialog.cpp:272
 msgid "Here you can choose the font size to be used."
 msgstr "ここで使用するフォントサイズを選択します。"
 
 #. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
-#: kdeui/kfontdialog.cpp:296
+#: tdeui/kfontdialog.cpp:296
 msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
 msgstr "The Quick いろはにほへと"
 
-#: kdeui/kfontdialog.cpp:301
+#: tdeui/kfontdialog.cpp:301
 msgid ""
 "This sample text illustrates the current settings. You may edit it to test "
 "special characters."
 msgstr "このサンプルテキストは現在の設定を示しています。テキストを編集して特殊な文字をテストできます。"
 
-#: kdeui/kfontdialog.cpp:310 kdeui/kfontdialog.cpp:320
+#: tdeui/kfontdialog.cpp:310 tdeui/kfontdialog.cpp:320
 msgid "Actual Font"
 msgstr "実際のフォント"
 
-#: kdeui/kactionselector.cpp:69
+#: tdeui/kactionselector.cpp:69
 msgid "&Available:"
 msgstr "利用可能(&A):"
 
-#: kdeui/kactionselector.cpp:84
+#: tdeui/kactionselector.cpp:84
 msgid "&Selected:"
 msgstr "選択済み(&S):"
 
-#: kdeui/kcharselect.cpp:366
+#: tdeui/kcharselect.cpp:366
 msgid ""
 "_: Character\n"
 "<qt><font size=\"+4\" face=\"%1\">%2</font>"
@@ -5368,51 +5368,51 @@ msgstr ""
 "<br>(十進数: %4)"
 "<br>(文字: %5)</qt>"
 
-#: kdeui/kcharselect.cpp:394
+#: tdeui/kcharselect.cpp:394
 msgid "Table:"
 msgstr "表:"
 
-#: kdeui/kcharselect.cpp:404
+#: tdeui/kcharselect.cpp:404
 msgid "&Unicode code point:"
 msgstr "Unicode コードポイント(&U):"
 
-#: kdeui/kmessagebox.cpp:428 kdeui/kmessagebox.cpp:479
+#: tdeui/kmessagebox.cpp:428 tdeui/kmessagebox.cpp:479
 msgid "Question"
 msgstr "質問"
 
-#: kdeui/kmessagebox.cpp:442 kdeui/kmessagebox.cpp:494
-#: kdeui/kmessagebox.cpp:575 kdeui/kmessagebox.cpp:647
-#: kdeui/kmessagebox.cpp:723
+#: tdeui/kmessagebox.cpp:442 tdeui/kmessagebox.cpp:494
+#: tdeui/kmessagebox.cpp:575 tdeui/kmessagebox.cpp:647
+#: tdeui/kmessagebox.cpp:723
 msgid "Do not ask again"
 msgstr "今後は確認しない"
 
-#: kdeui/kaboutdialog.cpp:1535 kdeui/khelpmenu.cpp:227
-#: kdeui/kmessagebox.cpp:975
+#: tdeui/kaboutdialog.cpp:1535 tdeui/khelpmenu.cpp:227
+#: tdeui/kmessagebox.cpp:975
 #, c-format
 msgid "About %1"
 msgstr "%1 について"
 
-#: kdeui/klineedit.cpp:890
+#: tdeui/klineedit.cpp:890
 msgid "Manual"
 msgstr "手動"
 
-#: kdeui/klineedit.cpp:891
+#: tdeui/klineedit.cpp:891
 msgid "Automatic"
 msgstr "自動"
 
-#: kdeui/klineedit.cpp:892
+#: tdeui/klineedit.cpp:892
 msgid "Dropdown List"
 msgstr "ドロップダウンリスト"
 
-#: kdeui/klineedit.cpp:893
+#: tdeui/klineedit.cpp:893
 msgid "Short Automatic"
 msgstr "短自動"
 
-#: kdeui/klineedit.cpp:894
+#: tdeui/klineedit.cpp:894
 msgid "Dropdown List && Automatic"
 msgstr "ドロップダウンリスト && 自動"
 
-#: kdeui/kaboutkde.cpp:34
+#: tdeui/kaboutkde.cpp:34
 msgid ""
 "The <b>K Desktop Environment</b> is written and maintained by the KDE Team, a "
 "world-wide network of software engineers committed to <a "
@@ -5433,7 +5433,7 @@ msgstr ""
 "<br>KDE プロジェクトの詳細については <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
 "をご覧ください。"
 
-#: kdeui/kaboutkde.cpp:43
+#: tdeui/kaboutkde.cpp:43
 msgid ""
 "Software can always be improved, and the KDE Team is ready to do so. However, "
 "you - the user - must tell us when something does not work as expected or could "
@@ -5457,7 +5457,7 @@ msgstr ""
 "<br>改良のためのいいアイディアをお持ちの場合も、バグ追跡システムを使ってあなたの要望をどしどしお寄せください。この場合、重要度には「要望」を指定してください"
 "。"
 
-#: kdeui/kaboutkde.cpp:54
+#: tdeui/kaboutkde.cpp:54
 msgid ""
 "You do not have to be a software developer to be a member of the KDE team. You "
 "can join the national teams that translate program interfaces. You can provide "
@@ -5480,7 +5480,7 @@ msgstr ""
 "<br>さらに詳しい情報やドキュメントが必要な場合は <A HREF=\"http://developer.kde.org/\">"
 "http://developer.kde.org</A> をご覧ください。"
 
-#: kdeui/kaboutkde.cpp:67
+#: tdeui/kaboutkde.cpp:67
 msgid ""
 "KDE is available free of charge, but making it is not free."
 "<br>"
@@ -5509,71 +5509,71 @@ msgstr ""
 "<br>"
 "<br>将来のあなたのサポートに感謝します。"
 
-#: kdeui/kaboutkde.cpp:81
+#: tdeui/kaboutkde.cpp:81
 #, c-format
 msgid "K Desktop Environment. Release %1"
 msgstr "K Desktop Environment. リリース %1"
 
-#: kdeui/kaboutkde.cpp:83
+#: tdeui/kaboutkde.cpp:83
 msgid ""
 "_: About KDE\n"
 "&About"
 msgstr "KDE について(&A)"
 
-#: kdeui/kaboutkde.cpp:84
+#: tdeui/kaboutkde.cpp:84
 msgid "&Report Bugs or Wishes"
 msgstr "バグや要望を報告(&R)"
 
-#: kdeui/kaboutkde.cpp:85
+#: tdeui/kaboutkde.cpp:85
 msgid "&Join the KDE Team"
 msgstr "KDE チームに参加(&J)"
 
-#: kdeui/kaboutkde.cpp:86
+#: tdeui/kaboutkde.cpp:86
 msgid "&Support KDE"
 msgstr "KDE をサポートする(&S)"
 
-#: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+#: tdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
 msgid "&Yes"
 msgstr "はい(&Y)"
 
-#: kdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
+#: tdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
 msgid "&No"
 msgstr "いいえ(&N)"
 
-#: kdeui/kstdguiitem.cpp:120
+#: tdeui/kstdguiitem.cpp:120
 msgid "Discard changes"
 msgstr "変更を破棄する"
 
-#: kdeui/kstdguiitem.cpp:121
+#: tdeui/kstdguiitem.cpp:121
 msgid ""
 "Pressing this button will discard all recent changes made in this dialog"
 msgstr "このボタンを押すとこのダイアログで行った変更を破棄します。"
 
-#: kdeui/kstdguiitem.cpp:127
+#: tdeui/kstdguiitem.cpp:127
 msgid "Save data"
 msgstr "データを保存"
 
-#: kdeui/kstdguiitem.cpp:132
+#: tdeui/kstdguiitem.cpp:132
 msgid "&Do Not Save"
 msgstr "保存しない(&D)"
 
-#: kdeui/kstdguiitem.cpp:133
+#: tdeui/kstdguiitem.cpp:133
 msgid "Don't save data"
 msgstr "データを保存しない"
 
-#: kdeui/kstdaction_p.h:44 kdeui/kstdguiitem.cpp:138
+#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
 msgid "Save &As..."
 msgstr "名前を付けて保存(&A)..."
 
-#: kdeui/kstdguiitem.cpp:139
+#: tdeui/kstdguiitem.cpp:139
 msgid "Save file with another name"
 msgstr "名前を付けてファイルを保存"
 
-#: kdeui/kstdguiitem.cpp:144
+#: tdeui/kstdguiitem.cpp:144
 msgid "Apply changes"
 msgstr "変更を適用"
 
-#: kdeui/kstdguiitem.cpp:145
+#: tdeui/kstdguiitem.cpp:145
 msgid ""
 "When clicking <b>Apply</b>, the settings will be handed over to the program, "
 "but the dialog will not be closed.\n"
@@ -5582,204 +5582,204 @@ msgstr ""
 "「適用」をクリックすると、設定はプログラムに渡されますが、ダイアログは閉じません。\n"
 "他の設定も試すときは、これを利用してください。"
 
-#: kdeui/kstdguiitem.cpp:153
+#: tdeui/kstdguiitem.cpp:153
 msgid "Administrator &Mode..."
 msgstr "管理者モード(&M)..."
 
-#: kdeui/kstdguiitem.cpp:153
+#: tdeui/kstdguiitem.cpp:153
 msgid "Enter Administrator Mode"
 msgstr "管理者モードに入る"
 
-#: kdeui/kstdguiitem.cpp:154
+#: tdeui/kstdguiitem.cpp:154
 msgid ""
 "When clicking <b>Administrator Mode</b> you will be prompted for the "
 "administrator (root) password in order to make changes which require root "
 "privileges."
 msgstr "「管理者モード」をクリックすると、root 権限が必要な変更を行うために管理者 (root) パスワードの入力を求められます。"
 
-#: kdeui/kstdguiitem.cpp:162
+#: tdeui/kstdguiitem.cpp:162
 msgid "Clear input"
 msgstr "入力フィールドをクリア"
 
-#: kdeui/kstdguiitem.cpp:163
+#: tdeui/kstdguiitem.cpp:163
 msgid "Clear the input in the edit field"
 msgstr "編集フィールドの入力をクリア"
 
-#: kdeui/kstdaction.cpp:62 kdeui/kstdguiitem.cpp:168
+#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
 msgid ""
 "_: show help\n"
 "&Help"
 msgstr "ヘルプ(&H)"
 
-#: kdeui/kstdguiitem.cpp:169
+#: tdeui/kstdguiitem.cpp:169
 msgid "Show help"
 msgstr "ヘルプを表示"
 
-#: kdeui/kstdguiitem.cpp:175
+#: tdeui/kstdguiitem.cpp:175
 msgid "Close the current window or document"
 msgstr "現在のウィンドウまたは文書を閉じる"
 
-#: kdeui/kstdguiitem.cpp:181
+#: tdeui/kstdguiitem.cpp:181
 msgid "Reset all items to their default values"
 msgstr "すべての設定項目を標準の値に戻す"
 
-#: kdeui/kstdaction.cpp:51 kdeui/kstdguiitem.cpp:188
+#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
 msgid ""
 "_: go back\n"
 "&Back"
 msgstr "戻る(&B)"
 
-#: kdeui/kstdguiitem.cpp:189
+#: tdeui/kstdguiitem.cpp:189
 msgid "Go back one step"
 msgstr "1 ステップ戻る"
 
-#: kdeui/kstdaction.cpp:56 kdeui/kstdguiitem.cpp:196
+#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
 msgid ""
 "_: go forward\n"
 "&Forward"
 msgstr "進む(&F)"
 
-#: kdeui/kstdguiitem.cpp:197
+#: tdeui/kstdguiitem.cpp:197
 msgid "Go forward one step"
 msgstr "1 ステップ進む"
 
-#: kdeui/kstdguiitem.cpp:208
+#: tdeui/kstdguiitem.cpp:208
 msgid "Opens the print dialog to print the current document"
 msgstr "現在のドキュメントを印刷するために印刷ダイアログを開く"
 
-#: kdeui/kstdguiitem.cpp:214
+#: tdeui/kstdguiitem.cpp:214
 msgid "C&ontinue"
 msgstr "続行(&O)"
 
-#: kdeui/kstdguiitem.cpp:215
+#: tdeui/kstdguiitem.cpp:215
 msgid "Continue operation"
 msgstr "操作を続ける"
 
-#: kdeui/kstdguiitem.cpp:221
+#: tdeui/kstdguiitem.cpp:221
 msgid "Delete item(s)"
 msgstr "アイテムを削除"
 
-#: kdeui/kstdguiitem.cpp:227
+#: tdeui/kstdguiitem.cpp:227
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: kdeui/kstdguiitem.cpp:233
+#: tdeui/kstdguiitem.cpp:233
 msgid "Quit application"
 msgstr "アプリケーションを終了"
 
-#: kdeui/kstdguiitem.cpp:238
+#: tdeui/kstdguiitem.cpp:238
 msgid "&Reset"
 msgstr "リセット(&R)"
 
-#: kdeui/kstdguiitem.cpp:239
+#: tdeui/kstdguiitem.cpp:239
 msgid "Reset configuration"
 msgstr "設定をリセット"
 
-#: kdeui/kstdguiitem.cpp:244
+#: tdeui/kstdguiitem.cpp:244
 msgid ""
 "_: Verb\n"
 "&Insert"
 msgstr "挿入(&I)"
 
-#: kdeui/kstdguiitem.cpp:249
+#: tdeui/kstdguiitem.cpp:249
 msgid "Confi&gure..."
 msgstr "設定(&G)..."
 
-#: kdeui/keditcl2.cpp:701 kdeui/keditcl2.cpp:833 kdeui/kstdguiitem.cpp:254
+#: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
 #: kutils/kfinddialog.cpp:239
 msgid "&Find"
 msgstr "検索(&F)"
 
-#: kdeui/kstdguiitem.cpp:274
+#: tdeui/kstdguiitem.cpp:274
 msgid "Test"
 msgstr "テスト"
 
-#: kdeui/kstdguiitem.cpp:284
+#: tdeui/kstdguiitem.cpp:284
 msgid "&Overwrite"
 msgstr "上書き(&O)"
 
-#: kdeui/kjanuswidget.cpp:156
+#: tdeui/kjanuswidget.cpp:156
 msgid "Empty Page"
 msgstr "空のページ"
 
-#: kdeui/ksyntaxhighlighter.cpp:477 kdeui/ksyntaxhighlighter.cpp:586
+#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
 msgid "As-you-type spell checking enabled."
 msgstr "逐次スペルチェックを有効にしました。"
 
-#: kdeui/ksyntaxhighlighter.cpp:479
+#: tdeui/ksyntaxhighlighter.cpp:479
 msgid "As-you-type spell checking disabled."
 msgstr "逐次スペルチェックを無効にしました。"
 
-#: kdeui/ksyntaxhighlighter.cpp:528
+#: tdeui/ksyntaxhighlighter.cpp:528
 msgid "Incremental Spellcheck"
 msgstr "更新された部分のみスペルチェック"
 
-#: kdeui/ksyntaxhighlighter.cpp:588
+#: tdeui/ksyntaxhighlighter.cpp:588
 msgid "Too many misspelled words. As-you-type spell checking disabled."
 msgstr "スペル間違いが多すぎます。逐次スペルチェックを無効にしました。"
 
-#: kdeui/kxmlguibuilder.cpp:166 kdeui/kxmlguibuilder.cpp:365
+#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
 msgid "No text!"
 msgstr "テキストがありません"
 
-#: kdeui/kauthicon.cpp:99
+#: tdeui/kauthicon.cpp:99
 msgid "Editing disabled"
 msgstr "編集不可能"
 
-#: kdeui/kauthicon.cpp:100
+#: tdeui/kauthicon.cpp:100
 msgid "Editing enabled"
 msgstr "編集可能"
 
-#: kdeui/ktoolbarhandler.cpp:86
+#: tdeui/ktoolbarhandler.cpp:86
 msgid "Show Toolbar"
 msgstr "ツールバーを表示"
 
-#: kdeui/ktoolbarhandler.cpp:87
+#: tdeui/ktoolbarhandler.cpp:87
 msgid "Hide Toolbar"
 msgstr "ツールバーを隠す"
 
-#: kdeui/ktoolbarhandler.cpp:91
+#: tdeui/ktoolbarhandler.cpp:91
 msgid "Toolbars"
 msgstr "ツールバー"
 
-#: kdeui/kdatepicker.cpp:88
+#: tdeui/kdatepicker.cpp:88
 #, c-format
 msgid "Week %1"
 msgstr "週 %1"
 
-#: kdeui/kdatepicker.cpp:163
+#: tdeui/kdatepicker.cpp:163
 msgid "Next year"
 msgstr "次の年"
 
-#: kdeui/kdatepicker.cpp:164
+#: tdeui/kdatepicker.cpp:164
 msgid "Previous year"
 msgstr "前の年"
 
-#: kdeui/kdatepicker.cpp:165
+#: tdeui/kdatepicker.cpp:165
 msgid "Next month"
 msgstr "次の月"
 
-#: kdeui/kdatepicker.cpp:166
+#: tdeui/kdatepicker.cpp:166
 msgid "Previous month"
 msgstr "前の月"
 
-#: kdeui/kdatepicker.cpp:167
+#: tdeui/kdatepicker.cpp:167
 msgid "Select a week"
 msgstr "週を選択"
 
-#: kdeui/kdatepicker.cpp:168
+#: tdeui/kdatepicker.cpp:168
 msgid "Select a month"
 msgstr "月を選択"
 
-#: kdeui/kdatepicker.cpp:169
+#: tdeui/kdatepicker.cpp:169
 msgid "Select a year"
 msgstr "年を選択"
 
-#: kdeui/kdatepicker.cpp:170
+#: tdeui/kdatepicker.cpp:170
 msgid "Select the current day"
 msgstr "現在の日を選択"
 
-#: kdeui/kwhatsthismanager.cpp:50
+#: tdeui/kwhatsthismanager.cpp:50
 msgid ""
 "<b>Not Defined</b>"
 "<br>There is no \"What's This?\" help assigned to this widget. If you want to "
@@ -5790,237 +5790,237 @@ msgstr ""
 "<br>このウィジェットには「これは何？」ヘルプが割り当てられていません。このウィジェットについて説明を書く手助けをしていただけるなら、私達に<a "
 "href=\"submit-whatsthis\">あなた自身の「これは何？」</a>を送ってください。"
 
-#: kdeui/kshortcutdialog.cpp:68
+#: tdeui/kshortcutdialog.cpp:68
 msgid "Configure Shortcut"
 msgstr "ショートカットを設定"
 
-#: kdeui/kshortcutdialog.cpp:71
+#: tdeui/kshortcutdialog.cpp:71
 msgid "Advanced"
 msgstr "詳細オプション"
 
-#: kdeui/kedittoolbar.cpp:49
+#: tdeui/kedittoolbar.cpp:49
 msgid "--- line separator ---"
 msgstr "--- セパレータ (線) ---"
 
-#: kdeui/kedittoolbar.cpp:50
+#: tdeui/kedittoolbar.cpp:50
 msgid "--- separator ---"
 msgstr "--- セパレータ (空白) ---"
 
-#: kdeui/kedittoolbar.cpp:380 kdeui/kedittoolbar.cpp:392
-#: kdeui/kedittoolbar.cpp:402 kdeui/kedittoolbar.cpp:411
+#: tdeui/kedittoolbar.cpp:380 tdeui/kedittoolbar.cpp:392
+#: tdeui/kedittoolbar.cpp:402 tdeui/kedittoolbar.cpp:411
 msgid "Configure Toolbars"
 msgstr "ツールバーを設定"
 
-#: kdeui/kedittoolbar.cpp:447
+#: tdeui/kedittoolbar.cpp:447
 msgid ""
 "Do you really want to reset all toolbars of this application to their default? "
 "The changes will be applied immediately."
 msgstr "本当にこのアプリケーションのすべてのツールバーを標準設定にリセットしますか？変更は直ちに適用されます。"
 
-#: kdeui/kedittoolbar.cpp:447
+#: tdeui/kedittoolbar.cpp:447
 msgid "Reset Toolbars"
 msgstr "ツールバーをリセット"
 
-#: kdeui/kedittoolbar.cpp:447 khtml/html/html_formimpl.cpp:2129
+#: tdeui/kedittoolbar.cpp:447 khtml/html/html_formimpl.cpp:2129
 #: khtml/khtmlview.cpp:2541 khtml/khtmlview.cpp:2574
 msgid "Reset"
 msgstr "リセット"
 
-#: kdeui/kedittoolbar.cpp:761
+#: tdeui/kedittoolbar.cpp:761
 msgid "&Toolbar:"
 msgstr "ツールバー(&T):"
 
-#: kdeui/kedittoolbar.cpp:777
+#: tdeui/kedittoolbar.cpp:777
 msgid "A&vailable actions:"
 msgstr "利用可能なアクション(&V):"
 
-#: kdeui/kedittoolbar.cpp:795
+#: tdeui/kedittoolbar.cpp:795
 msgid "Curr&ent actions:"
 msgstr "現在のアクション(&E):"
 
-#: kdeui/kedittoolbar.cpp:818
+#: tdeui/kedittoolbar.cpp:818
 msgid "Change &Icon..."
 msgstr "アイコンを変更(&I)..."
 
-#: kdeui/kedittoolbar.cpp:991
+#: tdeui/kedittoolbar.cpp:991
 msgid ""
 "This element will be replaced with all the elements of an embedded component."
 msgstr "この要素は、すべての埋め込みコンポーネントの要素で置き換えられます。"
 
-#: kdeui/kedittoolbar.cpp:993
+#: tdeui/kedittoolbar.cpp:993
 msgid "<Merge>"
 msgstr "<マージ>"
 
-#: kdeui/kedittoolbar.cpp:995
+#: tdeui/kedittoolbar.cpp:995
 msgid "<Merge %1>"
 msgstr "<マージ %1>"
 
-#: kdeui/kedittoolbar.cpp:1001
+#: tdeui/kedittoolbar.cpp:1001
 msgid ""
 "This is a dynamic list of actions. You can move it, but if you remove it you "
 "won't be able to re-add it."
 msgstr "操作の動的なリストです。操作の移動はできますが、削除すると再追加はできません。"
 
-#: kdeui/kedittoolbar.cpp:1002
+#: tdeui/kedittoolbar.cpp:1002
 #, c-format
 msgid "ActionList: %1"
 msgstr "操作リスト: %1"
 
-#: kdeui/kcolordialog.cpp:84
+#: tdeui/kcolordialog.cpp:84
 msgid ""
 "_: palette name\n"
 "* Recent Colors *"
 msgstr "* 最近の色 *"
 
-#: kdeui/kcolordialog.cpp:85
+#: tdeui/kcolordialog.cpp:85
 msgid ""
 "_: palette name\n"
 "* Custom Colors *"
 msgstr "* カスタム色 *"
 
-#: kdeui/kcolordialog.cpp:86
+#: tdeui/kcolordialog.cpp:86
 msgid ""
 "_: palette name\n"
 "Forty Colors"
 msgstr "40 色"
 
-#: kdeui/kcolordialog.cpp:87
+#: tdeui/kcolordialog.cpp:87
 msgid ""
 "_: palette name\n"
 "Rainbow Colors"
 msgstr "虹色"
 
-#: kdeui/kcolordialog.cpp:88
+#: tdeui/kcolordialog.cpp:88
 msgid ""
 "_: palette name\n"
 "Royal Colors"
 msgstr "壮美な色"
 
-#: kdeui/kcolordialog.cpp:89
+#: tdeui/kcolordialog.cpp:89
 msgid ""
 "_: palette name\n"
 "Web Colors"
 msgstr "ウェブ色"
 
-#: kdeui/kcolordialog.cpp:563
+#: tdeui/kcolordialog.cpp:563
 msgid "Named Colors"
 msgstr "名前のある色"
 
-#: kdeui/kcolordialog.cpp:717
+#: tdeui/kcolordialog.cpp:717
 msgid ""
 "Unable to read X11 RGB color strings. The following file location(s) were "
 "examined:\n"
 msgstr ""
 "X11 RGB 色指定文字列が読み込めません。以下のファイルの場所を調べました:\n"
 
-#: kdeui/kcolordialog.cpp:940
+#: tdeui/kcolordialog.cpp:940
 msgid "Select Color"
 msgstr "色を選択"
 
-#: kdeui/kcolordialog.cpp:1005
+#: tdeui/kcolordialog.cpp:1005
 msgid "H:"
 msgstr "H:"
 
-#: kdeui/kcolordialog.cpp:1014
+#: tdeui/kcolordialog.cpp:1014
 msgid "S:"
 msgstr "S:"
 
-#: kdeui/kcolordialog.cpp:1023
+#: tdeui/kcolordialog.cpp:1023
 msgid "V:"
 msgstr "V:"
 
-#: kdeui/kcolordialog.cpp:1035
+#: tdeui/kcolordialog.cpp:1035
 msgid "R:"
 msgstr "R:"
 
-#: kdeui/kcolordialog.cpp:1044
+#: tdeui/kcolordialog.cpp:1044
 msgid "G:"
 msgstr "G:"
 
-#: kdeui/kcolordialog.cpp:1053
+#: tdeui/kcolordialog.cpp:1053
 msgid "B:"
 msgstr "B:"
 
-#: kdeui/kcolordialog.cpp:1108
+#: tdeui/kcolordialog.cpp:1108
 msgid "&Add to Custom Colors"
 msgstr "カスタム色に追加(&A)"
 
-#: kdeui/kcolordialog.cpp:1140
+#: tdeui/kcolordialog.cpp:1140
 msgid "HTML:"
 msgstr "HTML:"
 
-#: kdeui/kcolordialog.cpp:1219
+#: tdeui/kcolordialog.cpp:1219
 msgid "Default color"
 msgstr "標準色"
 
-#: kdeui/kcolordialog.cpp:1247
+#: tdeui/kcolordialog.cpp:1247
 msgid "-default-"
 msgstr "-標準-"
 
-#: kdeui/kcolordialog.cpp:1463
+#: tdeui/kcolordialog.cpp:1463
 msgid "-unnamed-"
 msgstr "-名前なし-"
 
-#: kdeui/kstdaction.cpp:61
+#: tdeui/kstdaction.cpp:61
 msgid ""
 "_: beginning (of line)\n"
 "&Home"
 msgstr "ホーム(&H)"
 
-#: kdeui/kstdaction.cpp:240
+#: tdeui/kstdaction.cpp:240
 msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
 msgstr "メニューバーを表示<p>隠したメニューバーを再び表示します"
 
-#: kdeui/kstdaction.cpp:242
+#: tdeui/kstdaction.cpp:242
 msgid "Hide &Menubar"
 msgstr "メニューバーを隠す(&M)"
 
-#: kdeui/kstdaction.cpp:243
+#: tdeui/kstdaction.cpp:243
 msgid ""
 "Hide Menubar"
 "<p>Hide the menubar. You can usually get it back using the right mouse button "
 "inside the window itself."
 msgstr "メニューバーを隠す<p>メニューバーを隠します。通常、ウィンドウ内で右マウスボタンを使って元に戻せます。"
 
-#: kdeui/kstdaction.cpp:274 kdeui/kstdaction_p.h:97
+#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
 msgid "Show St&atusbar"
 msgstr "ステータスバーを表示(&A)"
 
-#: kdeui/kstdaction.cpp:276
+#: tdeui/kstdaction.cpp:276
 msgid ""
 "Show Statusbar"
 "<p>Shows the statusbar, which is the bar at the bottom of the window used for "
 "status information."
 msgstr "ステータスバーを表示 <p>ステータスバーを表示します (ウィンドウの下方にあるバーで状態情報表示のために使用されています)。"
 
-#: kdeui/kstdaction.cpp:278
+#: tdeui/kstdaction.cpp:278
 msgid "Hide St&atusbar"
 msgstr "ステータスバーを隠す(&A)"
 
-#: kdeui/kstdaction.cpp:279
+#: tdeui/kstdaction.cpp:279
 msgid ""
 "Hide Statusbar"
 "<p>Hides the statusbar, which is the bar at the bottom of the window used for "
 "status information."
 msgstr "ステータスバーを隠す <p>ステータスバーを隠します (ウィンドウの下方にあるバーで状態情報表示のために使用されています)。"
 
-#: kdeui/kpassdlg.cpp:372
+#: tdeui/kpassdlg.cpp:372
 msgid "&Password:"
 msgstr "パスワード(&P):"
 
-#: kdeui/kpassdlg.cpp:391
+#: tdeui/kpassdlg.cpp:391
 msgid "&Keep password"
 msgstr "パスワードを保存する(&K)"
 
-#: kdeui/kpassdlg.cpp:403
+#: tdeui/kpassdlg.cpp:403
 msgid "&Verify:"
 msgstr "検証(&V):"
 
-#: kdeui/kpassdlg.cpp:425
+#: tdeui/kpassdlg.cpp:425
 msgid "Password strength meter:"
 msgstr "パスワード強度計:"
 
-#: kdeui/kpassdlg.cpp:429
+#: tdeui/kpassdlg.cpp:429
 msgid ""
 "The password strength meter gives an indication of the security of the password "
 "you have entered.  To improve the strength of the password, try:\n"
@@ -6033,15 +6033,15 @@ msgstr ""
 " - 大文字と小文字を混在させる\n"
 " - 文字だけではなく数字や # のような記号も使用する"
 
-#: kdeui/kpassdlg.cpp:445 kdeui/kpassdlg.cpp:617
+#: tdeui/kpassdlg.cpp:445 tdeui/kpassdlg.cpp:617
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: kdeui/kpassdlg.cpp:515
+#: tdeui/kpassdlg.cpp:515
 msgid "You entered two different passwords. Please try again."
 msgstr "二つの異なったパスワードを入力しました。やり直してください。"
 
-#: kdeui/kpassdlg.cpp:522
+#: tdeui/kpassdlg.cpp:522
 msgid ""
 "The password you have entered has a low strength. To improve the strength of "
 "the password, try:\n"
@@ -6058,50 +6058,50 @@ msgstr ""
 "\n"
 "それでもこのパスワードを使用しますか？"
 
-#: kdeui/kpassdlg.cpp:530
+#: tdeui/kpassdlg.cpp:530
 msgid "Low Password Strength"
 msgstr "パスワードが堅固ではありません"
 
-#: kdeui/kpassdlg.cpp:611
+#: tdeui/kpassdlg.cpp:611
 msgid "Password is empty"
 msgstr "パスワードが入力されていません"
 
-#: kdeui/kpassdlg.cpp:614
+#: tdeui/kpassdlg.cpp:614
 #, c-format
 msgid ""
 "_n: Password must be at least 1 character long\n"
 "Password must be at least %n characters long"
 msgstr "パスワードは %n 文字以上必要です"
 
-#: kdeui/kpassdlg.cpp:616
+#: tdeui/kpassdlg.cpp:616
 msgid "Passwords match"
 msgstr "パスワードが一致しました"
 
-#: kdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
+#: tdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
 msgid "Check Spelling"
 msgstr "スペルチェック"
 
-#: kdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
+#: tdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
 msgid "&Finished"
 msgstr "完了(&F)"
 
-#: kdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
+#: tdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
 msgid "Clear &History"
 msgstr "履歴をクリア(&H)"
 
-#: kdeui/kcombobox.cpp:584
+#: tdeui/kcombobox.cpp:584
 msgid "No further item in the history."
 msgstr "履歴にはこれ以上項目はありません。"
 
-#: kdeui/klineeditdlg.cpp:92
+#: tdeui/klineeditdlg.cpp:92
 msgid "&Browse..."
 msgstr "ブラウズ(&B)..."
 
-#: kdeui/kdialogbase.cpp:636
+#: tdeui/kdialogbase.cpp:636
 msgid "&Try"
 msgstr "試す(&T)"
 
-#: kdeui/kdialogbase.cpp:904
+#: tdeui/kdialogbase.cpp:904
 msgid ""
 "If you press the <b>OK</b> button, all changes\n"
 "you made will be used to proceed."
@@ -6109,11 +6109,11 @@ msgstr ""
 "「OK」ボタンを押すとすべての変更\n"
 "が受け入れられます。"
 
-#: kdeui/kdialogbase.cpp:911
+#: tdeui/kdialogbase.cpp:911
 msgid "Accept settings"
 msgstr "設定を受け入れる"
 
-#: kdeui/kdialogbase.cpp:932
+#: tdeui/kdialogbase.cpp:932
 msgid ""
 "When clicking <b>Apply</b>, the settings will be\n"
 "handed over to the program, but the dialog\n"
@@ -6123,127 +6123,127 @@ msgstr ""
 "渡されますが、ダイアログは閉じません。\n"
 "他の設定も試すときは、これを利用してください。"
 
-#: kdeui/kdialogbase.cpp:941
+#: tdeui/kdialogbase.cpp:941
 msgid "Apply settings"
 msgstr "設定を適用"
 
-#: kdeui/kdialogbase.cpp:1130
+#: tdeui/kdialogbase.cpp:1130
 msgid "&Details"
 msgstr "詳細(&D)"
 
-#: kdeui/kdialogbase.cpp:1538
+#: tdeui/kdialogbase.cpp:1538
 msgid "Get help..."
 msgstr "ヘルプ..."
 
-#: kdeui/keditlistbox.cpp:124
+#: tdeui/keditlistbox.cpp:124
 msgid "&Add"
 msgstr "追加(&A)"
 
-#: kdeui/keditlistbox.cpp:148
+#: tdeui/keditlistbox.cpp:148
 msgid "Move &Up"
 msgstr "上に移動(&U)"
 
-#: kdeui/keditlistbox.cpp:153
+#: tdeui/keditlistbox.cpp:153
 msgid "Move &Down"
 msgstr "下に移動(&D)"
 
-#: kdeui/kbugreport.cpp:70
+#: tdeui/kbugreport.cpp:70
 msgid "Submit Bug Report"
 msgstr "バグレポートを送信"
 
-#: kdeui/kbugreport.cpp:110
+#: tdeui/kbugreport.cpp:110
 msgid ""
 "Your email address. If incorrect, use the Configure Email button to change it"
 msgstr "あなたのメールアドレスです。違っている場合は「Eメールを設定」ボタンを使って変更してください。"
 
-#: kdeui/kbugreport.cpp:111
+#: tdeui/kbugreport.cpp:111
 msgid "From:"
 msgstr "From:"
 
-#: kdeui/kbugreport.cpp:120
+#: tdeui/kbugreport.cpp:120
 msgid "Configure Email..."
 msgstr "Eメールを設定..."
 
-#: kdeui/kbugreport.cpp:127
+#: tdeui/kbugreport.cpp:127
 msgid "The email address this bug report is sent to."
 msgstr "このバグレポートの宛先となるメールアドレスです。"
 
-#: kdeui/kbugreport.cpp:128
+#: tdeui/kbugreport.cpp:128
 msgid "To:"
 msgstr "To:"
 
-#: kdeui/kbugreport.cpp:135
+#: tdeui/kbugreport.cpp:135
 msgid "&Send"
 msgstr "送信(&S)"
 
-#: kdeui/kbugreport.cpp:135
+#: tdeui/kbugreport.cpp:135
 msgid "Send bug report."
 msgstr "バグレポートを送信します。"
 
-#: kdeui/kbugreport.cpp:136
+#: tdeui/kbugreport.cpp:136
 #, c-format
 msgid "Send this bug report to %1."
 msgstr "バグレポートを %1 に送信します。"
 
-#: kdeui/kbugreport.cpp:147
+#: tdeui/kbugreport.cpp:147
 msgid ""
 "The application for which you wish to submit a bug report - if incorrect, "
 "please use the Report Bug menu item of the correct application"
 msgstr "バグレポートを送るアプリケーションです。違っている場合は、正しいアプリケーションのメニューから「バグを報告」を選択してください。"
 
-#: kdeui/kbugreport.cpp:148
+#: tdeui/kbugreport.cpp:148
 msgid "Application: "
 msgstr "アプリケーション:"
 
-#: kdeui/kbugreport.cpp:173
+#: tdeui/kbugreport.cpp:173
 msgid ""
 "The version of this application - please make sure that no newer version is "
 "available before sending a bug report"
 msgstr "このアプリケーションのバージョンです。バグレポートを送る前に、新しいバージョンが入手可能でないか確認してください。"
 
-#: kdeui/kbugreport.cpp:180
+#: tdeui/kbugreport.cpp:180
 msgid "no version set (programmer error!)"
 msgstr "バージョンが設定されていません (プログラマのミスです!)"
 
-#: kdeui/kbugreport.cpp:190
+#: tdeui/kbugreport.cpp:190
 msgid "OS:"
 msgstr "OS:"
 
-#: kdeui/kbugreport.cpp:202
+#: tdeui/kbugreport.cpp:202
 msgid "Compiler:"
 msgstr "コンパイラ:"
 
-#: kdeui/kbugreport.cpp:210
+#: tdeui/kbugreport.cpp:210
 msgid "Se&verity"
 msgstr "重要度(&V)"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Critical"
 msgstr "深刻"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Grave"
 msgstr "重大"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid ""
 "_: normal severity\n"
 "Normal"
 msgstr "普通"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Wishlist"
 msgstr "要望"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Translation"
 msgstr "翻訳"
 
-#: kdeui/kbugreport.cpp:225
+#: tdeui/kbugreport.cpp:225
 msgid "S&ubject: "
 msgstr "件名(&U):"
 
-#: kdeui/kbugreport.cpp:232
+#: tdeui/kbugreport.cpp:232
 msgid ""
 "Enter the text (in English if possible) that you wish to submit for the bug "
 "report.\n"
@@ -6253,7 +6253,7 @@ msgstr ""
 "バグレポートとして送るテキストを (可能なら英語で) 入力してください。\n"
 "「送信」を押すと、メールメッセージがこのプログラムのメンテナに送信されます。\n"
 
-#: kdeui/kbugreport.cpp:252
+#: tdeui/kbugreport.cpp:252
 msgid ""
 "To submit a bug report, click on the button below.\n"
 "This will open a web browser window on http://bugs.kde.org where you will find "
@@ -6264,23 +6264,23 @@ msgstr ""
 "ウェブブラウザのウィンドウに http://bugs.kde.org が開き、報告用のフォームが表示されます。\n"
 "上の情報がサーバに送られます。"
 
-#: kdeui/kbugreport.cpp:260
+#: tdeui/kbugreport.cpp:260
 msgid "&Launch Bug Report Wizard"
 msgstr "バグ報告ウィザードを表示(&L)"
 
-#: kdeui/kbugreport.cpp:298
+#: tdeui/kbugreport.cpp:298
 msgid ""
 "_: unknown program name\n"
 "unknown"
 msgstr "不明"
 
-#: kdeui/kbugreport.cpp:376
+#: tdeui/kbugreport.cpp:376
 msgid ""
 "You must specify both a subject and a description before the report can be "
 "sent."
 msgstr "件名と説明の両方を入力しなければレポートを送信することはできません。"
 
-#: kdeui/kbugreport.cpp:386
+#: tdeui/kbugreport.cpp:386
 msgid ""
 "<p>You chose the severity <b>Critical</b>. Please note that this severity is "
 "intended only for bugs that</p>"
@@ -6299,7 +6299,7 @@ msgstr ""
 "<li>影響を受けるパッケージがインストールされているシステムにセキュリティホールを設けてしまう。</li></ul>\n"
 "<p>報告しようとしているバグは上のいずれかに当てはまりますか？そうでなければ、これより低い重要度に変更してください。ありがとうございます!</p>"
 
-#: kdeui/kbugreport.cpp:397
+#: tdeui/kbugreport.cpp:397
 msgid ""
 "<p>You chose the severity <b>Grave</b>. Please note that this severity is "
 "intended only for bugs that</p>"
@@ -6318,7 +6318,7 @@ msgstr ""
 "<li>影響を受けるパッケージを使用しているユーザのアカウントにセキュリティホールを設けてしまう。</li></ul>\n"
 "<p>報告しようとしているバグは上のいずれかに当てはまりますか？そうでなければ、これより低い重要度に変更してください。ありがとうございます!</p>"
 
-#: kdeui/kbugreport.cpp:409
+#: tdeui/kbugreport.cpp:409
 msgid ""
 "Unable to send the bug report.\n"
 "Please submit a bug report manually...\n"
@@ -6328,11 +6328,11 @@ msgstr ""
 "バグレポートを手動で送信してみてください...\n"
 "方法については http://bugs.kde.org/ をご覧ください。"
 
-#: kdeui/kbugreport.cpp:417
+#: tdeui/kbugreport.cpp:417
 msgid "Bug report sent, thank you for your input."
 msgstr "バグレポートを送信しました。情報を提供していただきありがとうございます。"
 
-#: kdeui/kbugreport.cpp:426
+#: tdeui/kbugreport.cpp:426
 msgid ""
 "Close and discard\n"
 "edited message?"
@@ -6340,238 +6340,238 @@ msgstr ""
 "閉じて、編集した\n"
 "メッセージを破棄しますか？"
 
-#: kdeui/kbugreport.cpp:427
+#: tdeui/kbugreport.cpp:427
 msgid "Close Message"
 msgstr "メッセージを閉じる"
 
-#: kdeui/kcolorcombo.cpp:187 kdeui/kcolorcombo.cpp:240
+#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
 msgid "Custom..."
 msgstr "カスタム..."
 
-#: kdeui/ksystemtray.cpp:190
+#: tdeui/ksystemtray.cpp:190
 msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
 msgstr "<qt>本当に <b>%1</b> を終了しますか？</qt>"
 
-#: kdeui/ksystemtray.cpp:193
+#: tdeui/ksystemtray.cpp:193
 msgid "Confirm Quit From System Tray"
 msgstr "システムトレイから終了の確認"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:141
+#: tdeui/kpixmapregionselectorwidget.cpp:141
 msgid "Image Operations"
 msgstr "画像の操作"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:143
+#: tdeui/kpixmapregionselectorwidget.cpp:143
 msgid "&Rotate Clockwise"
 msgstr "時計回りに回転(&R)"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:148
+#: tdeui/kpixmapregionselectorwidget.cpp:148
 msgid "Rotate &Counterclockwise"
 msgstr "反時計回りに回転(&C)"
 
-#: kdeui/kdockwidget.cpp:237
+#: tdeui/kdockwidget.cpp:237
 msgid ""
 "_: Freeze the window geometry\n"
 "Freeze"
 msgstr "ウィンドウサイズを固定"
 
-#: kdeui/kdockwidget.cpp:244
+#: tdeui/kdockwidget.cpp:244
 msgid ""
 "_: Dock this window\n"
 "Dock"
 msgstr "ドック"
 
-#: kdeui/kdockwidget.cpp:251
+#: tdeui/kdockwidget.cpp:251
 msgid "Detach"
 msgstr "分離"
 
-#: kdeui/kwizard.cpp:48
+#: tdeui/kwizard.cpp:48
 msgid "&Back"
 msgstr "戻る(&B)"
 
-#: kdeui/kwizard.cpp:49
+#: tdeui/kwizard.cpp:49
 msgid ""
 "_: Opposite to Back\n"
 "&Next"
 msgstr "次(&N)"
 
-#: kdeui/khelpmenu.cpp:130 kdeui/kstdaction_p.h:108
+#: tdeui/khelpmenu.cpp:130 tdeui/kstdaction_p.h:108
 msgid "%1 &Handbook"
 msgstr "%1 ハンドブック(&H)"
 
-#: kdeui/khelpmenu.cpp:139
+#: tdeui/khelpmenu.cpp:139
 msgid "What's &This"
 msgstr "これは何(&T)"
 
-#: kdeui/khelpmenu.cpp:150 kdeui/kstdaction_p.h:111
+#: tdeui/khelpmenu.cpp:150 tdeui/kstdaction_p.h:111
 msgid "&Report Bug..."
 msgstr "バグを報告(&R)..."
 
-#: kdeui/khelpmenu.cpp:159 kdeui/kstdaction_p.h:112
+#: tdeui/khelpmenu.cpp:159 tdeui/kstdaction_p.h:112
 msgid "Switch application &language..."
 msgstr "アプリケーションの言語を切り替え(&L)..."
 
-#: kdeui/khelpmenu.cpp:170 kdeui/kstdaction_p.h:113
+#: tdeui/khelpmenu.cpp:170 tdeui/kstdaction_p.h:113
 #, c-format
 msgid "&About %1"
 msgstr "%1 について(&A)"
 
-#: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114
+#: tdeui/khelpmenu.cpp:176 tdeui/kstdaction_p.h:114
 msgid "About &KDE"
 msgstr "KDE について(&K)"
 
-#: kdeui/kactionclasses.cpp:2072
+#: tdeui/kactionclasses.cpp:2072
 msgid "Exit F&ull Screen Mode"
 msgstr "フルスクリーンモードを終了(&U)"
 
-#: kdeui/kactionclasses.cpp:2077 kdeui/kstdaction_p.h:98
+#: tdeui/kactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
 msgid "F&ull Screen Mode"
 msgstr "フルスクリーンモード(&U)"
 
-#: kdeui/klistviewsearchline.cpp:243
+#: tdeui/klistviewsearchline.cpp:243
 msgid "Search Columns"
 msgstr "カラム検索"
 
-#: kdeui/klistviewsearchline.cpp:245
+#: tdeui/klistviewsearchline.cpp:245
 msgid "All Visible Columns"
 msgstr "表示されているすべてのカラム"
 
-#: kdeui/klistviewsearchline.cpp:260
+#: tdeui/klistviewsearchline.cpp:260
 msgid ""
 "_: Column number %1\n"
 "Column No. %1"
 msgstr "カラム番号 %1"
 
-#: kdeui/klistviewsearchline.cpp:455
+#: tdeui/klistviewsearchline.cpp:455
 msgid "S&earch:"
 msgstr "検索(&E):"
 
-#: kdeui/ktip.cpp:206
+#: tdeui/ktip.cpp:206
 msgid "Tip of the Day"
 msgstr "今日の一言"
 
-#: kdeui/ktip.cpp:224
+#: tdeui/ktip.cpp:224
 msgid ""
 "Did you know...?\n"
 msgstr ""
 "知っていますか？\n"
 
-#: kdeui/ktip.cpp:287
+#: tdeui/ktip.cpp:287
 msgid "&Show tips on startup"
 msgstr "起動時に今日の一言を表示する(&S)"
 
-#: kdeui/ktoolbar.cpp:2040
+#: tdeui/ktoolbar.cpp:2040
 msgid "Toolbar Menu"
 msgstr "ツールバーメニュー"
 
-#: kdeui/ktoolbar.cpp:2043
+#: tdeui/ktoolbar.cpp:2043
 msgid ""
 "_: toolbar position string\n"
 "Top"
 msgstr "上"
 
-#: kdeui/ktoolbar.cpp:2044
+#: tdeui/ktoolbar.cpp:2044
 msgid ""
 "_: toolbar position string\n"
 "Left"
 msgstr "左"
 
-#: kdeui/ktoolbar.cpp:2045
+#: tdeui/ktoolbar.cpp:2045
 msgid ""
 "_: toolbar position string\n"
 "Right"
 msgstr "右"
 
-#: kdeui/ktoolbar.cpp:2046
+#: tdeui/ktoolbar.cpp:2046
 msgid ""
 "_: toolbar position string\n"
 "Bottom"
 msgstr "下"
 
-#: kdeui/ktoolbar.cpp:2048
+#: tdeui/ktoolbar.cpp:2048
 msgid ""
 "_: toolbar position string\n"
 "Floating"
 msgstr "フローティング"
 
-#: kdeui/ktoolbar.cpp:2049
+#: tdeui/ktoolbar.cpp:2049
 msgid ""
 "_: min toolbar\n"
 "Flat"
 msgstr "フラット"
 
-#: kdeui/ktoolbar.cpp:2052
+#: tdeui/ktoolbar.cpp:2052
 msgid "Icons Only"
 msgstr "アイコンのみ"
 
-#: kdeui/ktoolbar.cpp:2053
+#: tdeui/ktoolbar.cpp:2053
 msgid "Text Only"
 msgstr "文字のみ"
 
-#: kdeui/ktoolbar.cpp:2054
+#: tdeui/ktoolbar.cpp:2054
 msgid "Text Alongside Icons"
 msgstr "アイコンの横に文字"
 
-#: kdeui/ktoolbar.cpp:2055
+#: tdeui/ktoolbar.cpp:2055
 msgid "Text Under Icons"
 msgstr "アイコンの下に文字"
 
-#: kdeui/ktoolbar.cpp:2080 kdeui/ktoolbar.cpp:2101
+#: tdeui/ktoolbar.cpp:2080 tdeui/ktoolbar.cpp:2101
 msgid "Small (%1x%2)"
 msgstr "小 (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2082 kdeui/ktoolbar.cpp:2103
+#: tdeui/ktoolbar.cpp:2082 tdeui/ktoolbar.cpp:2103
 msgid "Medium (%1x%2)"
 msgstr "中 (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2084 kdeui/ktoolbar.cpp:2105
+#: tdeui/ktoolbar.cpp:2084 tdeui/ktoolbar.cpp:2105
 msgid "Large (%1x%2)"
 msgstr "大 (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2086 kdeui/ktoolbar.cpp:2107
+#: tdeui/ktoolbar.cpp:2086 tdeui/ktoolbar.cpp:2107
 msgid "Huge (%1x%2)"
 msgstr "特大 (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2118
+#: tdeui/ktoolbar.cpp:2118
 msgid "Text Position"
 msgstr "テキストの位置"
 
-#: kdeui/ktoolbar.cpp:2120
+#: tdeui/ktoolbar.cpp:2120
 msgid "Icon Size"
 msgstr "アイコンサイズ"
 
-#: kdeui/kaboutdialog.cpp:93
+#: tdeui/kaboutdialog.cpp:93
 msgid "Task"
 msgstr "タスク"
 
-#: kdeui/kaboutdialog.cpp:704
+#: tdeui/kaboutdialog.cpp:704
 msgid "%1 %2 (Using KDE %3)"
 msgstr "%1 %2 (KDE %3 を使用)"
 
-#: kdeui/kaboutdialog.cpp:706
+#: tdeui/kaboutdialog.cpp:706
 msgid "%1 %2, %3"
 msgstr "%1 %2, %3"
 
-#: kdeui/kaboutdialog.cpp:1326
+#: tdeui/kaboutdialog.cpp:1326
 msgid "Other Contributors:"
 msgstr "その他の貢献者:"
 
-#: kdeui/kaboutdialog.cpp:1327
+#: tdeui/kaboutdialog.cpp:1327
 msgid "(No logo available)"
 msgstr "(ロゴはありません)"
 
-#: kdeui/kaboutdialog.cpp:1772
+#: tdeui/kaboutdialog.cpp:1772
 msgid "Image missing"
 msgstr "画像がありません"
 
-#: kdeui/ktimezonewidget.cpp:45
+#: tdeui/ktimezonewidget.cpp:45
 msgid "Area"
 msgstr "エリア"
 
-#: kab/addressbook.cc:295 kdeui/ktimezonewidget.cpp:47
+#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
 msgid "Comment"
 msgstr "コメント"
 
-#: kdeui/keditcl2.cpp:105 kdeui/keditcl2.cpp:375 kdeui/keditcl2.cpp:454
+#: tdeui/keditcl2.cpp:105 tdeui/keditcl2.cpp:375 tdeui/keditcl2.cpp:454
 msgid ""
 "End of document reached.\n"
 "Continue from the beginning?"
@@ -6579,7 +6579,7 @@ msgstr ""
 "文書の末尾です。\n"
 "先頭から続けますか？"
 
-#: kdeui/keditcl2.cpp:118 kdeui/keditcl2.cpp:388 kdeui/keditcl2.cpp:467
+#: tdeui/keditcl2.cpp:118 tdeui/keditcl2.cpp:388 tdeui/keditcl2.cpp:467
 msgid ""
 "Beginning of document reached.\n"
 "Continue from the end?"
@@ -6587,87 +6587,87 @@ msgstr ""
 "文書の先頭です。\n"
 "末尾から続けますか？"
 
-#: kdeui/keditcl2.cpp:711 kdeui/keditcl2.cpp:844
+#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
 msgid "Find:"
 msgstr "検索:"
 
-#: kdeui/keditcl2.cpp:728 kdeui/keditcl2.cpp:868
+#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
 msgid "Case &sensitive"
 msgstr "大文字小文字を区別する(&S)"
 
-#: kdeui/keditcl2.cpp:730 kdeui/keditcl2.cpp:870 kutils/kfinddialog.cpp:171
+#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 kutils/kfinddialog.cpp:171
 msgid "Find &backwards"
 msgstr "後ろ向き検索(&B)"
 
-#: kdeui/keditcl2.cpp:833
+#: tdeui/keditcl2.cpp:833
 msgid "Replace &All"
 msgstr "すべて置換(&A)"
 
-#: kdeui/keditcl2.cpp:852
+#: tdeui/keditcl2.cpp:852
 msgid "Replace with:"
 msgstr "次と置換:"
 
-#: kdeui/keditcl2.cpp:984
+#: tdeui/keditcl2.cpp:984
 msgid "Go to line:"
 msgstr "行に移動:"
 
-#: kdeui/kwindowlistmenu.cpp:129
+#: tdeui/twindowlistmenu.cpp:129
 msgid "Unclutter Windows"
 msgstr "ウィンドウを整頓"
 
-#: kdeui/kwindowlistmenu.cpp:131
+#: tdeui/twindowlistmenu.cpp:131
 msgid "Cascade Windows"
 msgstr "ウィンドウをカスケード"
 
-#: kdeui/kwindowlistmenu.cpp:185
+#: tdeui/twindowlistmenu.cpp:185
 msgid "On All Desktops"
 msgstr "すべてのデスクトップ"
 
-#: kdeui/kwindowlistmenu.cpp:213
+#: tdeui/twindowlistmenu.cpp:213
 msgid "No Windows"
 msgstr "ウィンドウなし"
 
-#: kdeui/ktextedit.cpp:231
+#: tdeui/ktextedit.cpp:231
 msgid "Check Spelling..."
 msgstr "スペルチェック..."
 
-#: kdeui/ktextedit.cpp:237
+#: tdeui/ktextedit.cpp:237
 msgid "Auto Spell Check"
 msgstr "自動スペルチェク"
 
-#: kdeui/ktextedit.cpp:241
+#: tdeui/ktextedit.cpp:241
 msgid "Allow Tabulations"
 msgstr "タブを許可"
 
-#: kdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
+#: tdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
 msgid "Spell Checking"
 msgstr "スペルチェック"
 
-#: kdeui/kspell.cpp:1176
+#: tdeui/kspell.cpp:1176
 msgid "You have to restart the dialog for changes to take effect"
 msgstr "変更を反映するにはダイアログを再起動する必要があります。"
 
-#: kdeui/kspell.cpp:1402
+#: tdeui/kspell.cpp:1402
 msgid "Spell Checker"
 msgstr "スペルチェッカー"
 
-#: kdeui/kcommand.cpp:151 kdeui/kcommand.cpp:166 kdeui/kcommand.cpp:199
-#: kdeui/kcommand.cpp:241
+#: tdeui/kcommand.cpp:151 tdeui/kcommand.cpp:166 tdeui/kcommand.cpp:199
+#: tdeui/kcommand.cpp:241
 #, c-format
 msgid "&Undo: %1"
 msgstr "元に戻す(&U): %1"
 
-#: kdeui/kcommand.cpp:192 kdeui/kcommand.cpp:247
+#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
 #, c-format
 msgid "&Redo: %1"
 msgstr "やり直す(&R): %1"
 
-#: kdeui/kcommand.cpp:322
+#: tdeui/kcommand.cpp:322
 #, c-format
 msgid "Undo: %1"
 msgstr "元に戻す: %1"
 
-#: kdeui/kcommand.cpp:341 kdeui/kcommand.cpp:346
+#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
 #, c-format
 msgid "Redo: %1"
 msgstr "やり直す: %1"
@@ -7836,10 +7836,10 @@ msgstr ""
 #: kinit/klauncher_main.cpp:58
 msgid ""
 "klauncher: This program is not supposed to be started manually.\n"
-"klauncher: It is started automatically by kdeinit.\n"
+"klauncher: It is started automatically by tdeinit.\n"
 msgstr ""
 "klauncher: このプログラムは手動で起動されることは想定されていません。\n"
-"klauncher: これは kdeinit によって自動的に起動されます。\n"
+"klauncher: これは tdeinit によって自動的に起動されます。\n"
 
 #: kinit/klauncher.cpp:743
 msgid "KDEInit could not launch '%1'."
@@ -9169,281 +9169,281 @@ msgstr "読み込みエラー - おそらく不正なパスワードです。"
 msgid "Decryption error."
 msgstr "暗号解除エラー。"
 
-#: kdeui/kstdaction_p.h:40
+#: tdeui/kstdaction_p.h:40
 msgid "&New"
 msgstr "新規(&N)"
 
-#: kdeui/kstdaction_p.h:45
+#: tdeui/kstdaction_p.h:45
 msgid "Re&vert"
 msgstr "戻す(&V)"
 
-#: kdeui/kstdaction_p.h:48
+#: tdeui/kstdaction_p.h:48
 msgid "Print Previe&w..."
 msgstr "印刷プレビュー(&W)..."
 
-#: kdeui/kstdaction_p.h:49
+#: tdeui/kstdaction_p.h:49
 msgid "&Mail..."
 msgstr "メール(&M)..."
 
-#: kdeui/kstdaction_p.h:53
+#: tdeui/kstdaction_p.h:53
 msgid "Re&do"
 msgstr "やり直す(&D)"
 
-#: kdeui/kstdaction_p.h:59
+#: tdeui/kstdaction_p.h:59
 msgid "Select &All"
 msgstr "すべて選択(&A)"
 
-#: kdeui/kstdaction_p.h:60
+#: tdeui/kstdaction_p.h:60
 msgid "Dese&lect"
 msgstr "選択解除(&L)"
 
-#: kdeui/kstdaction_p.h:64
+#: tdeui/kstdaction_p.h:64
 msgid "Find Pre&vious"
 msgstr "前を検索(&V)"
 
-#: kdeui/kstdaction_p.h:67
+#: tdeui/kstdaction_p.h:67
 msgid "&Actual Size"
 msgstr "実際のサイズ(&A)"
 
-#: kdeui/kstdaction_p.h:68
+#: tdeui/kstdaction_p.h:68
 msgid "&Fit to Page"
 msgstr "ページに合わせる(&F)"
 
-#: kdeui/kstdaction_p.h:69
+#: tdeui/kstdaction_p.h:69
 msgid "Fit to Page &Width"
 msgstr "ページの幅に合わせる(&W)"
 
-#: kdeui/kstdaction_p.h:70
+#: tdeui/kstdaction_p.h:70
 msgid "Fit to Page &Height"
 msgstr "ページの高さに合わせる(&H)"
 
-#: kdeui/kstdaction_p.h:71
+#: tdeui/kstdaction_p.h:71
 msgid "Zoom &In"
 msgstr "拡大(&I)"
 
-#: kdeui/kstdaction_p.h:72
+#: tdeui/kstdaction_p.h:72
 msgid "Zoom &Out"
 msgstr "縮小(&O)"
 
-#: kdeui/kstdaction_p.h:73
+#: tdeui/kstdaction_p.h:73
 msgid "&Zoom..."
 msgstr "ズーム(&Z)..."
 
-#: kdeui/kstdaction_p.h:75
+#: tdeui/kstdaction_p.h:75
 msgid "&Redisplay"
 msgstr "再表示(&R)"
 
-#: kdeui/kstdaction_p.h:77
+#: tdeui/kstdaction_p.h:77
 msgid "&Up"
 msgstr "上(&U)"
 
-#: kdeui/kstdaction_p.h:82
+#: tdeui/kstdaction_p.h:82
 msgid "&Previous Page"
 msgstr "前のページ(&P)"
 
-#: kdeui/kstdaction_p.h:83
+#: tdeui/kstdaction_p.h:83
 msgid "&Next Page"
 msgstr "次のページ(&N)"
 
-#: kdeui/kstdaction_p.h:84
+#: tdeui/kstdaction_p.h:84
 msgid "&Go To..."
 msgstr "移動(&G)..."
 
-#: kdeui/kstdaction_p.h:85
+#: tdeui/kstdaction_p.h:85
 msgid "&Go to Page..."
 msgstr "ページに移動(&G)..."
 
-#: kdeui/kstdaction_p.h:86
+#: tdeui/kstdaction_p.h:86
 msgid "&Go to Line..."
 msgstr "行に移動(&G)..."
 
-#: kdeui/kstdaction_p.h:87
+#: tdeui/kstdaction_p.h:87
 msgid "&First Page"
 msgstr "最初のページ(&F)"
 
-#: kdeui/kstdaction_p.h:88
+#: tdeui/kstdaction_p.h:88
 msgid "&Last Page"
 msgstr "最後のページ(&L)"
 
-#: kdeui/kstdaction_p.h:91
+#: tdeui/kstdaction_p.h:91
 msgid "&Edit Bookmarks"
 msgstr "ブックマークを編集(&E)"
 
-#: kdeui/kstdaction_p.h:99
+#: tdeui/kstdaction_p.h:99
 msgid "&Save Settings"
 msgstr "設定を保存(&S)"
 
-#: kdeui/kstdaction_p.h:100
+#: tdeui/kstdaction_p.h:100
 msgid "Configure S&hortcuts..."
 msgstr "ショートカットを設定(&H)..."
 
-#: kdeui/kstdaction_p.h:101
+#: tdeui/kstdaction_p.h:101
 msgid "&Configure %1..."
 msgstr "%1 を設定(&C)..."
 
-#: kdeui/kstdaction_p.h:102
+#: tdeui/kstdaction_p.h:102
 msgid "Configure Tool&bars..."
 msgstr "ツールバーを設定(&B)..."
 
-#: kdeui/kstdaction_p.h:103
+#: tdeui/kstdaction_p.h:103
 msgid "Configure &Notifications..."
 msgstr "通知を設定(&N)..."
 
-#: kdeui/kstdaction_p.h:109
+#: tdeui/kstdaction_p.h:109
 msgid "What's &This?"
 msgstr "これは何？(&T)"
 
-#: kdeui/kstdaction_p.h:110
+#: tdeui/kstdaction_p.h:110
 msgid "Tip of the &Day"
 msgstr "今日の一言(&D)"
 
-#: kdecore/kde-config.cpp.in:14
+#: tdecore/kde-config.cpp.in:14
 msgid "A little program to output installation paths"
 msgstr "インストールパスを出力する小さなプログラム"
 
-#: kdecore/kde-config.cpp.in:18
+#: tdecore/kde-config.cpp.in:18
 msgid "expand ${prefix} and ${exec_prefix} in output"
 msgstr "出力で ${prefix} と ${exec_prefix} を展開"
 
-#: kdecore/kde-config.cpp.in:19
+#: tdecore/kde-config.cpp.in:19
 msgid "Compiled in prefix for KDE libraries"
 msgstr "KDE ライブラリ用の prefix でコンパイル"
 
-#: kdecore/kde-config.cpp.in:20
+#: tdecore/kde-config.cpp.in:20
 msgid "Compiled in exec_prefix for KDE libraries"
 msgstr "KDE ライブラリ用の exec_prefix でコンパイル"
 
-#: kdecore/kde-config.cpp.in:21
+#: tdecore/kde-config.cpp.in:21
 msgid "Compiled in library path suffix"
 msgstr "ライブラリパスサフィックスでコンパイル"
 
-#: kdecore/kde-config.cpp.in:22
+#: tdecore/kde-config.cpp.in:22
 msgid "Prefix in $HOME used to write files"
 msgstr "ファイル書き出しに用いられる $HOME でプレフィックス"
 
-#: kdecore/kde-config.cpp.in:23
+#: tdecore/kde-config.cpp.in:23
 msgid "Compiled in version string for KDE libraries"
 msgstr "KDE ライブラリ用のバージョン文字列でコンパイル"
 
-#: kdecore/kde-config.cpp.in:24
+#: tdecore/kde-config.cpp.in:24
 msgid "Available KDE resource types"
 msgstr "利用可能な KDE リソース型"
 
-#: kdecore/kde-config.cpp.in:25
+#: tdecore/kde-config.cpp.in:25
 msgid "Search path for resource type"
 msgstr "リソース型用検索パス"
 
-#: kdecore/kde-config.cpp.in:26
+#: tdecore/kde-config.cpp.in:26
 msgid "User path: desktop|autostart|trash|document"
 msgstr "ユーザ path: desktop|autostart|trash|document"
 
-#: kdecore/kde-config.cpp.in:27
+#: tdecore/kde-config.cpp.in:27
 msgid "Prefix to install resource files to"
 msgstr "リソースファイルをインストールするプレフィックス"
 
-#: kdecore/kde-config.cpp.in:168
+#: tdecore/kde-config.cpp.in:168
 msgid "Applications menu (.desktop files)"
 msgstr "アプリケーションメニュー (.desktop ファイル)"
 
-#: kdecore/kde-config.cpp.in:169
+#: tdecore/kde-config.cpp.in:169
 msgid "CGIs to run from kdehelp"
 msgstr "kdehelp から起動される CGI"
 
-#: kdecore/kde-config.cpp.in:170
+#: tdecore/kde-config.cpp.in:170
 msgid "Configuration files"
 msgstr "設定ファイル"
 
-#: kdecore/kde-config.cpp.in:171
+#: tdecore/kde-config.cpp.in:171
 msgid "Where applications store data"
 msgstr "アプリケーションのデータ保存場所"
 
-#: kdecore/kde-config.cpp.in:172
+#: tdecore/kde-config.cpp.in:172
 msgid "Executables in $prefix/bin"
 msgstr "$prefix/bin にある実行ファイル"
 
-#: kdecore/kde-config.cpp.in:173
+#: tdecore/kde-config.cpp.in:173
 msgid "HTML documentation"
 msgstr "HTML ドキュメント"
 
-#: kdecore/kde-config.cpp.in:174
+#: tdecore/kde-config.cpp.in:174
 msgid "Icons"
 msgstr "アイコン"
 
-#: kdecore/kde-config.cpp.in:175
+#: tdecore/kde-config.cpp.in:175
 msgid "Configuration description files"
 msgstr "設定記述ファイル"
 
-#: kdecore/kde-config.cpp.in:176
+#: tdecore/kde-config.cpp.in:176
 msgid "Libraries"
 msgstr "ライブラリ"
 
-#: kdecore/kde-config.cpp.in:177
+#: tdecore/kde-config.cpp.in:177
 msgid "Includes/Headers"
 msgstr "ヘッダ"
 
-#: kdecore/kde-config.cpp.in:178
+#: tdecore/kde-config.cpp.in:178
 msgid "Translation files for KLocale"
 msgstr "KLocale のための翻訳ファイル"
 
-#: kdecore/kde-config.cpp.in:179
+#: tdecore/kde-config.cpp.in:179
 msgid "Mime types"
 msgstr "MIME タイプ"
 
-#: kdecore/kde-config.cpp.in:180
+#: tdecore/kde-config.cpp.in:180
 msgid "Loadable modules"
 msgstr "ローダブルモジュール"
 
-#: kdecore/kde-config.cpp.in:181
+#: tdecore/kde-config.cpp.in:181
 msgid "Qt plugins"
 msgstr "Qt プラグイン"
 
-#: kdecore/kde-config.cpp.in:182
+#: tdecore/kde-config.cpp.in:182
 msgid "Services"
 msgstr "サービス"
 
-#: kdecore/kde-config.cpp.in:183
+#: tdecore/kde-config.cpp.in:183
 msgid "Service types"
 msgstr "サービスタイプ"
 
-#: kdecore/kde-config.cpp.in:184
+#: tdecore/kde-config.cpp.in:184
 msgid "Application sounds"
 msgstr "アプリケーションサウンド"
 
-#: kdecore/kde-config.cpp.in:185
+#: tdecore/kde-config.cpp.in:185
 msgid "Templates"
 msgstr "テンプレート"
 
-#: kdecore/kde-config.cpp.in:186
+#: tdecore/kde-config.cpp.in:186
 msgid "Wallpapers"
 msgstr "壁紙"
 
-#: kdecore/kde-config.cpp.in:187
+#: tdecore/kde-config.cpp.in:187
 msgid "XDG Application menu (.desktop files)"
 msgstr "XDG アプリケーションメニュー (.desktop ファイル)"
 
-#: kdecore/kde-config.cpp.in:188
+#: tdecore/kde-config.cpp.in:188
 msgid "XDG Menu descriptions (.directory files)"
 msgstr "XDG メニュー説明 (.directory ファイル)"
 
-#: kdecore/kde-config.cpp.in:189
+#: tdecore/kde-config.cpp.in:189
 msgid "XDG Menu layout (.menu files)"
 msgstr "XDG メニュー配置 (.menu ファイル)"
 
-#: kdecore/kde-config.cpp.in:190
+#: tdecore/kde-config.cpp.in:190
 msgid "Temporary files (specific for both current host and current user)"
 msgstr "一時ファイル (現在のホストと現在のユーザの両方について指定)"
 
-#: kdecore/kde-config.cpp.in:191
+#: tdecore/kde-config.cpp.in:191
 msgid "UNIX Sockets (specific for both current host and current user)"
 msgstr "UNIX ソケット (現在のホストと現在のユーザの両方について指定)"
 
-#: kdecore/kde-config.cpp.in:203
+#: tdecore/kde-config.cpp.in:203
 msgid ""
 "%1 - unknown type\n"
 msgstr ""
 "%1 - 不明なタイプ\n"
 
-#: kdecore/kde-config.cpp.in:228
+#: tdecore/kde-config.cpp.in:228
 msgid ""
 "%1 - unknown type of userpath\n"
 msgstr ""
diff --git a/tde-i18n-ja/messages/kdelibs/kdelibs_colors.po b/tde-i18n-ja/messages/kdelibs/kdelibs_colors.po
index 2681b4fd992..1ae21fc43b6 100644
--- a/tde-i18n-ja/messages/kdelibs/kdelibs_colors.po
+++ b/tde-i18n-ja/messages/kdelibs/kdelibs_colors.po
@@ -1,10 +1,10 @@
-# translation of kdelibs_colors.po to Japanese
+# translation of tdelibs_colors.po to Japanese
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Ryuichi Kakuda <[email protected]>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdelibs_colors\n"
+"Project-Id-Version: tdelibs_colors\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2006-06-19 21:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdelibs/kdeprint.po b/tde-i18n-ja/messages/kdelibs/kdeprint.po
index 0fb1bc0ecd7..03bef1d7ea4 100644
--- a/tde-i18n-ja/messages/kdelibs/kdeprint.po
+++ b/tde-i18n-ja/messages/kdelibs/kdeprint.po
@@ -1,4 +1,4 @@
-# translation of kdeprint.po to Japanese
+# translation of tdeprint.po to Japanese
 # Taiki Komoda <[email protected]>, 2002, 2004.
 # Ryuichi Kakuda <[email protected]>, 2004.
 # Toyohiro Asukai <[email protected]>, 2004.
@@ -8,7 +8,7 @@
 # Yukiko Bando <[email protected]>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprint\n"
+"Project-Id-Version: tdeprint\n"
 "POT-Creation-Date: 2007-08-27 01:12+0200\n"
 "PO-Revision-Date: 2007-04-26 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -3120,7 +3120,7 @@ msgstr "要求されたページが見つかりません。"
 msgid "&Finish"
 msgstr "完了(&F)"
 
-#: management/kdeprint_management_module.cpp:48
+#: management/tdeprint_management_module.cpp:48
 msgid "Select Command"
 msgstr "コマンドを選択"
 
@@ -4896,7 +4896,7 @@ msgstr "印刷データを生成中: ページ %1"
 msgid "Previewing..."
 msgstr "プレビュー..."
 
-#: kdeprintd.cpp:158 kprinter.cpp:690
+#: tdeprintd.cpp:158 kprinter.cpp:690
 #, c-format
 msgid ""
 "<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
@@ -4962,11 +4962,11 @@ msgstr "%1 のリモートキュー"
 
 #: kmspecialmanager.cpp:53
 msgid ""
-"A file share/kdeprint/specials.desktop was found in your local KDE directory. "
+"A file share/tdeprint/specials.desktop was found in your local KDE directory. "
 "This file probably comes from a previous KDE release and should be removed in "
 "order to manage global pseudo printers."
 msgstr ""
-"share/kdeprint/specials.desktop ファイルがあなたのローカル KDE "
+"share/tdeprint/specials.desktop ファイルがあなたのローカル KDE "
 "ディレクトリに見つかりました。これはおそらく前のバージョンの KDE のものです。グローバル疑似プリンタを使用するには、削除する必要があります。"
 
 #: kprinterimpl.cpp:156
@@ -4993,9 +4993,9 @@ msgstr "子印刷プロセスを開始できません。"
 
 #: kprinterimpl.cpp:281
 msgid ""
-"The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this "
+"The KDE print server (<b>tdeprintd</b>) could not be contacted. Check that this "
 "server is running."
-msgstr "KDE 印刷サーバ (<b>kdeprintd</b>) とコンタクトできません。このサーバが起動しているか確認してください。"
+msgstr "KDE 印刷サーバ (<b>tdeprintd</b>) とコンタクトできません。このサーバが起動しているか確認してください。"
 
 #: kprinterimpl.cpp:283
 msgid ""
@@ -5501,7 +5501,7 @@ msgstr "プロセスが異常終了しました (<b>%1</b>)。"
 msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
 msgstr "<b>%1</b>: 実行失敗、エラーメッセージ:<p>%2</p>"
 
-#: kdeprintd.cpp:176
+#: tdeprintd.cpp:176
 msgid ""
 "Some of the files to print are not readable by the KDE print daemon. This may "
 "happen if you are trying to print as a different user to the one currently "
@@ -5511,20 +5511,20 @@ msgstr ""
 "印刷デーモンから読み込めませんでした。これは現在ログインしているユーザと異なるユーザで印刷しようとした場合に起こります。印刷を続けるには root "
 "のパスワードを入力してください。"
 
-#: kdeprintd.cpp:181
+#: tdeprintd.cpp:181
 msgid "Provide root's Password"
 msgstr "root のパスワードを入力してください"
 
-#: kdeprintd.cpp:200 kdeprintd.cpp:202
+#: tdeprintd.cpp:200 tdeprintd.cpp:202
 #, c-format
 msgid "Printing Status - %1"
 msgstr "印刷状態 - %1"
 
-#: kdeprintd.cpp:263
+#: tdeprintd.cpp:263
 msgid "Printing system"
 msgstr "印刷システム"
 
-#: kdeprintd.cpp:266
+#: tdeprintd.cpp:266
 msgid "Authentication failed (user name=%1)"
 msgstr "認証失敗 (ユーザ名=%1)"
 
diff --git a/tde-i18n-ja/messages/kdelibs/kio_help.po b/tde-i18n-ja/messages/kdelibs/kio_help.po
index 1dc9b0d6d5c..34bb333848b 100644
--- a/tde-i18n-ja/messages/kdelibs/kio_help.po
+++ b/tde-i18n-ja/messages/kdelibs/kio_help.po
@@ -88,8 +88,8 @@ msgid "Create a cache file for the document"
 msgstr "ドキュメント用のキャッシュファイルを作成する"
 
 #: meinproc.cpp:81
-msgid "Set the srcdir, for kdelibs"
-msgstr "kdelibs のために、srcdir を設定"
+msgid "Set the srcdir, for tdelibs"
+msgstr "tdelibs のために、srcdir を設定"
 
 #: meinproc.cpp:82
 msgid "Parameters to pass to the stylesheet"
diff --git a/tde-i18n-ja/messages/kdelibs/timezones.po b/tde-i18n-ja/messages/kdelibs/timezones.po
index 4727c768970..972243cf0f5 100644
--- a/tde-i18n-ja/messages/kdelibs/timezones.po
+++ b/tde-i18n-ja/messages/kdelibs/timezones.po
@@ -1,5 +1,5 @@
 # translation of timezones.po to Japanese
-# translation of kdelibs.po to Japanese
+# translation of tdelibs.po to Japanese
 # Taiki Komoda <[email protected]>, 2002, 2004.
 # Ryuichi Kakuda <[email protected]>, 2004.
 # Shinichi Tsunoda <[email protected]>, 2005.
diff --git a/tde-i18n-ja/messages/kdemultimedia/Makefile.in b/tde-i18n-ja/messages/kdemultimedia/Makefile.in
index e2d07fb7e97..6836f120aa0 100644
--- a/tde-i18n-ja/messages/kdemultimedia/Makefile.in
+++ b/tde-i18n-ja/messages/kdemultimedia/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdemultimedia
+subdir = messages/tdemultimedia
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdemultimedia/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdemultimedia/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -690,10 +690,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdemultimedia/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdemultimedia/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdemultimedia/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdemultimedia/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdemultimedia/krec.po b/tde-i18n-ja/messages/kdemultimedia/krec.po
index 71cdf4f5560..ce0d4013a82 100644
--- a/tde-i18n-ja/messages/kdemultimedia/krec.po
+++ b/tde-i18n-ja/messages/kdemultimedia/krec.po
@@ -458,13 +458,13 @@ msgstr ""
 #: krecord.cpp:343
 msgid ""
 "Possible reasons are:\n"
-"- You installed KRec on its own without the rest of kdemultimedia.\n"
+"- You installed KRec on its own without the rest of tdemultimedia.\n"
 "- You installed everything correctly, but did not restart the aRts daemon\n"
 " and therefore it is not aware of the new effects.\n"
 "- This is a bug."
 msgstr ""
 "考えられる理由:\n"
-"- kdemultimediaのKRec 以外のものをインストールしなかった。\n"
+"- tdemultimediaのKRec 以外のものをインストールしなかった。\n"
 "- すべて正しくインストールしたが、aRts デーモンを再起動しなかったので\n"
 "新しい効果を認識できなかった。\n"
 "- バグ。"
diff --git a/tde-i18n-ja/messages/kdenetwork/Makefile.in b/tde-i18n-ja/messages/kdenetwork/Makefile.in
index e79bad9f94c..d000bc05dc1 100644
--- a/tde-i18n-ja/messages/kdenetwork/Makefile.in
+++ b/tde-i18n-ja/messages/kdenetwork/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdenetwork
+subdir = messages/tdenetwork
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdenetwork/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdenetwork/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -674,10 +674,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdenetwork/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdenetwork/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdenetwork/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdenetwork/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdepim/Makefile.in b/tde-i18n-ja/messages/kdepim/Makefile.in
index ace911a741b..a83e8c491d6 100644
--- a/tde-i18n-ja/messages/kdepim/Makefile.in
+++ b/tde-i18n-ja/messages/kdepim/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdepim
+subdir = messages/tdepim
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = libkdepim.po kfile_rfc822.po kres_blogging.po karm.po kres_xmlrpc.po kandy.po scalixadmin.po ktnef.po kfile_vcf.po kdepimwizards.po kres_remote.po kdgantt.po kabc2mutt.po kwatchgnupg.po kontact.po kabc_slox.po kleopatra.po kres_featureplan.po kfile_ics.po konsolekalendar.po kres_exchange.po kitchensync.po kcmkabconfig.po knode.po kmail.po libksieve.po kio_imap4.po kfile_palm.po kres_tvanytime.po korganizer.po kres_groupware.po libkpimexchange.po kcmkontactnt.po kres_scalix.po kio_mobile.po kres_groupwise.po kres_birthday.po libkleopatra.po kpilot.po kmail_text_calendar_plugin.po kdepimresources.po knotes.po libkmime.po akregator.po kmail_text_vcard_plugin.po libkcal.po kmobile.po kalarm.po kio_groupwise.po korn.po kaddressbook.po kio_scalix.po libkholidays.po kio_sieve.po kres_kolab.po libkpgp.po kmailcvt.po kgantt.po
-GMOFILES = libkdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo scalixadmin.gmo ktnef.gmo kfile_vcf.gmo kdepimwizards.gmo kres_remote.gmo kdgantt.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kitchensync.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo kres_scalix.gmo kio_mobile.gmo kres_groupwise.gmo kres_birthday.gmo libkleopatra.gmo kpilot.gmo kmail_text_calendar_plugin.gmo kdepimresources.gmo knotes.gmo libkmime.gmo akregator.gmo kmail_text_vcard_plugin.gmo libkcal.gmo kmobile.gmo kalarm.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo kio_scalix.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo kmailcvt.gmo kgantt.gmo
+POFILES = libtdepim.po kfile_rfc822.po kres_blogging.po karm.po kres_xmlrpc.po kandy.po scalixadmin.po ktnef.po kfile_vcf.po tdepimwizards.po kres_remote.po kdgantt.po kabc2mutt.po kwatchgnupg.po kontact.po kabc_slox.po kleopatra.po kres_featureplan.po kfile_ics.po konsolekalendar.po kres_exchange.po kitchensync.po kcmkabconfig.po knode.po kmail.po libksieve.po kio_imap4.po kfile_palm.po kres_tvanytime.po korganizer.po kres_groupware.po libkpimexchange.po kcmkontactnt.po kres_scalix.po kio_mobile.po kres_groupwise.po kres_birthday.po libkleopatra.po kpilot.po kmail_text_calendar_plugin.po tdepimresources.po knotes.po libkmime.po akregator.po kmail_text_vcard_plugin.po libkcal.po kmobile.po kalarm.po kio_groupwise.po korn.po kaddressbook.po kio_scalix.po libkholidays.po kio_sieve.po kres_kolab.po libkpgp.po kmailcvt.po kgantt.po
+GMOFILES = libtdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo scalixadmin.gmo ktnef.gmo kfile_vcf.gmo tdepimwizards.gmo kres_remote.gmo kdgantt.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kitchensync.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo kres_scalix.gmo kio_mobile.gmo kres_groupwise.gmo kres_birthday.gmo libkleopatra.gmo kpilot.gmo kmail_text_calendar_plugin.gmo tdepimresources.gmo knotes.gmo libkmime.gmo akregator.gmo kmail_text_vcard_plugin.gmo libkcal.gmo kmobile.gmo kalarm.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo kio_scalix.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo kmailcvt.gmo kgantt.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdepim/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdepim/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdepim/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdepim/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdepim/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdepim/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdepim/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdepim/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdepim/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdepim/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,12 +531,12 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=knode.po konsolekalendar.po karm.po kgantt.po kres_scalix.po kio_mobile.po kio_sieve.po akregator.po scalixadmin.po kres_birthday.po ktnef.po kandy.po kres_remote.po kdepimresources.po kio_groupwise.po kres_tvanytime.po kfile_vcf.po kres_groupware.po kwatchgnupg.po korn.po korganizer.po kdgantt.po kcmkontactnt.po kres_groupwise.po Makefile.in kres_exchange.po kfile_palm.po kmail_text_vcard_plugin.po kleopatra.po libkholidays.po libkdepim.po kres_featureplan.po libksieve.po libkpimexchange.po kabc2mutt.po kres_kolab.po kontact.po libkmime.po kdepimwizards.po knotes.po kaddressbook.po kres_blogging.po kmobile.po kcmkabconfig.po kmailcvt.po kres_xmlrpc.po kitchensync.po kpilot.po kmail_text_calendar_plugin.po kfile_ics.po libkleopatra.po kabc_slox.po libkcal.po kfile_rfc822.po kmail.po kio_scalix.po kalarm.po kio_imap4.po libkpgp.po Makefile.am 
+KDE_DIST=knode.po konsolekalendar.po karm.po kgantt.po kres_scalix.po kio_mobile.po kio_sieve.po akregator.po scalixadmin.po kres_birthday.po ktnef.po kandy.po kres_remote.po tdepimresources.po kio_groupwise.po kres_tvanytime.po kfile_vcf.po kres_groupware.po kwatchgnupg.po korn.po korganizer.po kdgantt.po kcmkontactnt.po kres_groupwise.po Makefile.in kres_exchange.po kfile_palm.po kmail_text_vcard_plugin.po kleopatra.po libkholidays.po libtdepim.po kres_featureplan.po libksieve.po libkpimexchange.po kabc2mutt.po kres_kolab.po kontact.po libkmime.po tdepimwizards.po knotes.po kaddressbook.po kres_blogging.po kmobile.po kcmkabconfig.po kmailcvt.po kres_xmlrpc.po kitchensync.po kpilot.po kmail_text_calendar_plugin.po kfile_ics.po libkleopatra.po kabc_slox.po libkcal.po kfile_rfc822.po kmail.po kio_scalix.po kalarm.po kio_imap4.po libkpgp.po Makefile.am 
 
 #>+ 175
-libkdepim.gmo: libkdepim.po
-	rm -f libkdepim.gmo; $(GMSGFMT) -o libkdepim.gmo $(srcdir)/libkdepim.po
-	test ! -f libkdepim.gmo || touch libkdepim.gmo
+libtdepim.gmo: libtdepim.po
+	rm -f libtdepim.gmo; $(GMSGFMT) -o libtdepim.gmo $(srcdir)/libtdepim.po
+	test ! -f libtdepim.gmo || touch libtdepim.gmo
 kfile_rfc822.gmo: kfile_rfc822.po
 	rm -f kfile_rfc822.gmo; $(GMSGFMT) -o kfile_rfc822.gmo $(srcdir)/kfile_rfc822.po
 	test ! -f kfile_rfc822.gmo || touch kfile_rfc822.gmo
@@ -561,9 +561,9 @@ ktnef.gmo: ktnef.po
 kfile_vcf.gmo: kfile_vcf.po
 	rm -f kfile_vcf.gmo; $(GMSGFMT) -o kfile_vcf.gmo $(srcdir)/kfile_vcf.po
 	test ! -f kfile_vcf.gmo || touch kfile_vcf.gmo
-kdepimwizards.gmo: kdepimwizards.po
-	rm -f kdepimwizards.gmo; $(GMSGFMT) -o kdepimwizards.gmo $(srcdir)/kdepimwizards.po
-	test ! -f kdepimwizards.gmo || touch kdepimwizards.gmo
+tdepimwizards.gmo: tdepimwizards.po
+	rm -f tdepimwizards.gmo; $(GMSGFMT) -o tdepimwizards.gmo $(srcdir)/tdepimwizards.po
+	test ! -f tdepimwizards.gmo || touch tdepimwizards.gmo
 kres_remote.gmo: kres_remote.po
 	rm -f kres_remote.gmo; $(GMSGFMT) -o kres_remote.gmo $(srcdir)/kres_remote.po
 	test ! -f kres_remote.gmo || touch kres_remote.gmo
@@ -654,9 +654,9 @@ kpilot.gmo: kpilot.po
 kmail_text_calendar_plugin.gmo: kmail_text_calendar_plugin.po
 	rm -f kmail_text_calendar_plugin.gmo; $(GMSGFMT) -o kmail_text_calendar_plugin.gmo $(srcdir)/kmail_text_calendar_plugin.po
 	test ! -f kmail_text_calendar_plugin.gmo || touch kmail_text_calendar_plugin.gmo
-kdepimresources.gmo: kdepimresources.po
-	rm -f kdepimresources.gmo; $(GMSGFMT) -o kdepimresources.gmo $(srcdir)/kdepimresources.po
-	test ! -f kdepimresources.gmo || touch kdepimresources.gmo
+tdepimresources.gmo: tdepimresources.po
+	rm -f tdepimresources.gmo; $(GMSGFMT) -o tdepimresources.gmo $(srcdir)/tdepimresources.po
+	test ! -f tdepimresources.gmo || touch tdepimresources.gmo
 knotes.gmo: knotes.po
 	rm -f knotes.gmo; $(GMSGFMT) -o knotes.gmo $(srcdir)/knotes.po
 	test ! -f knotes.gmo || touch knotes.gmo
@@ -711,12 +711,12 @@ kgantt.gmo: kgantt.po
 
 #>+ 3
 clean-nls:
-	-rm -f  libkdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo scalixadmin.gmo ktnef.gmo kfile_vcf.gmo kdepimwizards.gmo kres_remote.gmo kdgantt.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kitchensync.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo kres_scalix.gmo kio_mobile.gmo kres_groupwise.gmo kres_birthday.gmo libkleopatra.gmo kpilot.gmo kmail_text_calendar_plugin.gmo kdepimresources.gmo knotes.gmo libkmime.gmo akregator.gmo kmail_text_vcard_plugin.gmo libkcal.gmo kmobile.gmo kalarm.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo kio_scalix.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo kmailcvt.gmo kgantt.gmo
+	-rm -f  libtdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo scalixadmin.gmo ktnef.gmo kfile_vcf.gmo tdepimwizards.gmo kres_remote.gmo kdgantt.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kitchensync.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo kres_scalix.gmo kio_mobile.gmo kres_groupwise.gmo kres_birthday.gmo libkleopatra.gmo kpilot.gmo kmail_text_calendar_plugin.gmo tdepimresources.gmo knotes.gmo libkmime.gmo akregator.gmo kmail_text_vcard_plugin.gmo libkcal.gmo kmobile.gmo kalarm.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo kio_scalix.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo kmailcvt.gmo kgantt.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in libkdepim kfile_rfc822 kres_blogging karm kres_xmlrpc kandy scalixadmin ktnef kfile_vcf kdepimwizards kres_remote kdgantt kabc2mutt kwatchgnupg kontact kabc_slox kleopatra kres_featureplan kfile_ics konsolekalendar kres_exchange kitchensync kcmkabconfig knode kmail libksieve kio_imap4 kfile_palm kres_tvanytime korganizer kres_groupware libkpimexchange kcmkontactnt kres_scalix kio_mobile kres_groupwise kres_birthday libkleopatra kpilot kmail_text_calendar_plugin kdepimresources knotes libkmime akregator kmail_text_vcard_plugin libkcal kmobile kalarm kio_groupwise korn kaddressbook kio_scalix libkholidays kio_sieve kres_kolab libkpgp kmailcvt kgantt ; do \
+	@for base in libtdepim kfile_rfc822 kres_blogging karm kres_xmlrpc kandy scalixadmin ktnef kfile_vcf tdepimwizards kres_remote kdgantt kabc2mutt kwatchgnupg kontact kabc_slox kleopatra kres_featureplan kfile_ics konsolekalendar kres_exchange kitchensync kcmkabconfig knode kmail libksieve kio_imap4 kfile_palm kres_tvanytime korganizer kres_groupware libkpimexchange kcmkontactnt kres_scalix kio_mobile kres_groupwise kres_birthday libkleopatra kpilot kmail_text_calendar_plugin tdepimresources knotes libkmime akregator kmail_text_vcard_plugin libkcal kmobile kalarm kio_groupwise korn kaddressbook kio_scalix libkholidays kio_sieve kres_kolab libkpgp kmailcvt kgantt ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -726,7 +726,7 @@ install-nls:
 
 #>+ 60
 uninstall-nls:
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkdepim.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtdepim.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfile_rfc822.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kres_blogging.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/karm.mo
@@ -735,7 +735,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/scalixadmin.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktnef.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfile_vcf.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdepimwizards.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdepimwizards.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kres_remote.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdgantt.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kabc2mutt.mo
@@ -766,7 +766,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkleopatra.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpilot.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kmail_text_calendar_plugin.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdepimresources.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdepimresources.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/knotes.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkmime.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/akregator.mo
@@ -810,10 +810,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdepim/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdepim/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdepim/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdepim/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdepim/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdepim/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdepim/kdepimresources.po b/tde-i18n-ja/messages/kdepim/kdepimresources.po
index 79f3c9f77e0..67b45f677ee 100644
--- a/tde-i18n-ja/messages/kdepim/kdepimresources.po
+++ b/tde-i18n-ja/messages/kdepim/kdepimresources.po
@@ -1,10 +1,10 @@
-# translation of kdepimresources.pot to Japanese 
+# translation of tdepimresources.pot to Japanese 
 # Tadashi Jokagi <[email protected]>, 200i5.
 # Yukiko Bando <[email protected]>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdepimresources\n"
+"Project-Id-Version: tdepimresources\n"
 "POT-Creation-Date: 2005-03-13 01:24+0100\n"
 "PO-Revision-Date: 2006-03-14 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdepim/kdepimwizards.po b/tde-i18n-ja/messages/kdepim/kdepimwizards.po
index 807c9a67fa2..20057697b41 100644
--- a/tde-i18n-ja/messages/kdepim/kdepimwizards.po
+++ b/tde-i18n-ja/messages/kdepim/kdepimwizards.po
@@ -1,11 +1,11 @@
-# translation of kdepimwizards.po to Japanese
+# translation of tdepimwizards.po to Japanese
 # Toyohiro Asukai <[email protected]>, 2004.
 # Tadashi Jokagi <[email protected]>, 2005.
 # Shinichi Tsunoda <[email protected]>, 2005.
 # Yukiko Bando <[email protected]>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdepimwizards\n"
+"Project-Id-Version: tdepimwizards\n"
 "POT-Creation-Date: 2008-01-26 01:19+0100\n"
 "PO-Revision-Date: 2008-01-29 20:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdepim/kpilot.po b/tde-i18n-ja/messages/kdepim/kpilot.po
index f582baea7aa..4aaface10b1 100644
--- a/tde-i18n-ja/messages/kdepim/kpilot.po
+++ b/tde-i18n-ja/messages/kdepim/kpilot.po
@@ -327,8 +327,8 @@ msgid "%1 Conduit"
 msgstr "%1 コンジット"
 
 #: lib/plugin.cc:144
-msgid "Send questions and comments to [email protected]"
-msgstr "質問やコメントは [email protected] まで"
+msgid "Send questions and comments to [email protected]"
+msgstr "質問やコメントは [email protected] まで"
 
 #: lib/plugin.cc:194
 msgid "Send questions and comments to <a href=\"mailto:%1\">%2</a>."
@@ -1915,7 +1915,7 @@ msgstr "アーカイブ(&A)"
 #: kpilot/dbRecordEditor.cc:193
 msgid ""
 "To view and edit the record data, please install a hex editor (e.g. kbytesedit "
-"from kdeutils)."
+"from tdeutils)."
 msgstr "レコードデータの閲覧および編集を行うには、バイナリエディタ (例えば kbytesedit) をインストールしてください。"
 
 #: kpilot/datebookWidget.cc:58 kpilot/dbviewerWidget.cc:109
@@ -2159,7 +2159,7 @@ msgstr "AppInfo ブロックを編集"
 #: kpilot/dbAppInfoEditor.cc:68
 msgid ""
 "To view the Application info block data, please install a hex editor (e.g. "
-"khexedit from kdeutils)."
+"khexedit from tdeutils)."
 msgstr "アプリケーションのブロックデータを閲覧するには、バイナリエディタ (例えば khexedit) をインストールしてください。"
 
 #: kpilot/dbAppInfoEditor.cc:86
@@ -2603,7 +2603,7 @@ msgstr "ハンドヘルド上のエントリ"
 #: kpilot/internalEditorAction.cc:263 kpilot/internalEditorAction.cc:291
 msgid ""
 "To view and edit the record data, please install a hex editor (e.g. khexedit "
-"from kdeutils)."
+"from tdeutils)."
 msgstr "レコードデータの閲覧と編集を行うには、バイナリエディタ (例えば khexedit) をインストールしてください。"
 
 #: kpilot/internalEditorAction.cc:315
diff --git a/tde-i18n-ja/messages/kdepim/libkdepim.po b/tde-i18n-ja/messages/kdepim/libkdepim.po
index 1f00ab6bfd5..a5fedb436e8 100644
--- a/tde-i18n-ja/messages/kdepim/libkdepim.po
+++ b/tde-i18n-ja/messages/kdepim/libkdepim.po
@@ -1,4 +1,4 @@
-# translation of libkdepim.po to Japanese
+# translation of libtdepim.po to Japanese
 # Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # Taiki Komoda <[email protected]>, 2002.
 # Shinichi Tsunoda <[email protected]>, 2004, 2005.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libkdepim\n"
+"Project-Id-Version: libtdepim\n"
 "POT-Creation-Date: 2008-07-14 01:18+0200\n"
 "PO-Revision-Date: 2007-02-27 21:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
diff --git a/tde-i18n-ja/messages/kdesdk/Makefile.in b/tde-i18n-ja/messages/kdesdk/Makefile.in
index 316f36a9a5c..532c7c53bd1 100644
--- a/tde-i18n-ja/messages/kdesdk/Makefile.in
+++ b/tde-i18n-ja/messages/kdesdk/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdesdk
+subdir = messages/tdesdk
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdesdk/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdesdk/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdesdk/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdesdk/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdesdk/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdesdk/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdesdk/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdesdk/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdesdk/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdesdk/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -638,10 +638,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdesdk/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdesdk/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdesdk/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdesdk/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdesdk/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdesdk/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdesdk/kbabel.po b/tde-i18n-ja/messages/kdesdk/kbabel.po
index 41433c00d73..25236363062 100644
--- a/tde-i18n-ja/messages/kdesdk/kbabel.po
+++ b/tde-i18n-ja/messages/kdesdk/kbabel.po
@@ -2196,11 +2196,11 @@ msgstr "言語コードを先に指定してください。"
 msgid ""
 "It is not possible to find out the number of singular/plural forms "
 "automatically for the language code \"%1\".\n"
-"Do you have kdelibs.po installed for this language?\n"
+"Do you have tdelibs.po installed for this language?\n"
 "Please set the correct number manually."
 msgstr ""
 "言語コード \"%1\" の単数形/複数形の数が見つかりません。\n"
-"この言語の kdelibs.po をインストールしていますか？\n"
+"この言語の tdelibs.po をインストールしていますか？\n"
 "正しい数を手動でセットしてください。"
 
 #: commonui/projectprefwidgets.cpp:626
diff --git a/tde-i18n-ja/messages/kdetoys/Makefile.in b/tde-i18n-ja/messages/kdetoys/Makefile.in
index cf56918862d..491c6812607 100644
--- a/tde-i18n-ja/messages/kdetoys/Makefile.in
+++ b/tde-i18n-ja/messages/kdetoys/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdetoys
+subdir = messages/tdetoys
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdetoys/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdetoys/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdetoys/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdetoys/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdetoys/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdetoys/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdetoys/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdetoys/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdetoys/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdetoys/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -610,10 +610,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdetoys/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdetoys/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdetoys/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdetoys/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdetoys/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdetoys/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeutils/Makefile.in b/tde-i18n-ja/messages/kdeutils/Makefile.in
index 85ad875c838..35000524b0e 100644
--- a/tde-i18n-ja/messages/kdeutils/Makefile.in
+++ b/tde-i18n-ja/messages/kdeutils/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdeutils
+subdir = messages/tdeutils
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeutils/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeutils/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdeutils/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdeutils/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeutils/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeutils/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeutils/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeutils/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeutils/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeutils/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -702,10 +702,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdeutils/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdeutils/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdeutils/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdeutils/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdeutils/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdeutils/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdeutils/ark.po b/tde-i18n-ja/messages/kdeutils/ark.po
index ee5e2ab9cbd..af86251f58a 100644
--- a/tde-i18n-ja/messages/kdeutils/ark.po
+++ b/tde-i18n-ja/messages/kdeutils/ark.po
@@ -894,9 +894,9 @@ msgstr "Konqueror に統合する(&E)"
 #, no-c-format
 msgid ""
 "<font size=\"-1\"><i>Konqueror integration is only available if you install the "
-"Konqueror integration plugin from the kdeaddons package.</i></font>"
+"Konqueror integration plugin from the tdeaddons package.</i></font>"
 msgstr ""
-"<font size=\"-1\"><i>Konqueror との統合は、kdeaddons パッケージ中の Konqueror "
+"<font size=\"-1\"><i>Konqueror との統合は、tdeaddons パッケージ中の Konqueror "
 "統合プラグインがインストールされている場合のみ有効です。</i></font>"
 
 #. i18n: file ark.kcfg line 9
@@ -1024,10 +1024,10 @@ msgstr "Konqueror に統合する"
 #, no-c-format
 msgid ""
 "Enables integration with Konqueror's context menus, letting you easily archive "
-"or unarchive files. This option will only work if you have the kdeaddons "
+"or unarchive files. This option will only work if you have the tdeaddons "
 "package installed."
 msgstr ""
-"Konqeuror のコンテキストメニューに統合し、ファイルのアーカイブ化や展開を容易にします。このオプションは kdeaddons "
+"Konqeuror のコンテキストメニューに統合し、ファイルのアーカイブ化や展開を容易にします。このオプションは tdeaddons "
 "パッケージがインストールされている場合のみ有効です。"
 
 #. i18n: file ark.kcfg line 74
diff --git a/tde-i18n-ja/messages/kdeutils/kcmlaptop.po b/tde-i18n-ja/messages/kdeutils/kcmlaptop.po
index d6b3fc00204..425278a9781 100644
--- a/tde-i18n-ja/messages/kdeutils/kcmlaptop.po
+++ b/tde-i18n-ja/messages/kdeutils/kcmlaptop.po
@@ -630,9 +630,9 @@ msgstr "klaptop_acpi_helper の特権を変更するには root のパスワー�
 
 #: acpi.cpp:193
 msgid ""
-"The ACPI helper cannot be enabled because kdesu cannot be found.  Please make "
+"The ACPI helper cannot be enabled because tdesu cannot be found.  Please make "
 "sure that it is installed correctly."
-msgstr "ACPI ヘルパーアプリケーションを有効にできませんでした。kdesu が正しくインストールされているか確認してください。"
+msgstr "ACPI ヘルパーアプリケーションを有効にできませんでした。tdesu が正しくインストールされているか確認してください。"
 
 #: acpi.cpp:276
 msgid ""
@@ -692,9 +692,9 @@ msgstr "/dev/sonypi のプロテクションを変更するには root のパス
 
 #: sony.cpp:126
 msgid ""
-"The /dev/sonypi protections cannot be changed because kdesu cannot be found.  "
+"The /dev/sonypi protections cannot be changed because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
-msgstr "/dev/sonypi のプロテクションを変更できませんでした。kdesu が正しくインストールされているか確認してください。"
+msgstr "/dev/sonypi のプロテクションを変更できませんでした。tdesu が正しくインストールされているか確認してください。"
 
 #: sony.cpp:187
 msgid ""
@@ -931,15 +931,15 @@ msgstr "%1 アプリケーションの特権を変更するには root のパス
 
 #: apm.cpp:173
 msgid ""
-"%1 cannot be enabled because kdesu cannot be found.  Please make sure that it "
+"%1 cannot be enabled because tdesu cannot be found.  Please make sure that it "
 "is installed correctly."
-msgstr "%1を有効にできませんでした。kdesu が正しくインストールされているか確認してください。"
+msgstr "%1を有効にできませんでした。tdesu が正しくインストールされているか確認してください。"
 
 #: apm.cpp:215
 msgid ""
-"The Software Suspend helper cannot be enabled because kdesu cannot be found.  "
+"The Software Suspend helper cannot be enabled because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
-msgstr "ソフトウェアサスペンドのヘルパーを有効にできませんでした。kdesu が正しくインストールされているか確認してください。"
+msgstr "ソフトウェアサスペンドのヘルパーを有効にできませんでした。tdesu が正しくインストールされているか確認してください。"
 
 #: apm.cpp:279
 msgid ""
diff --git a/tde-i18n-ja/messages/kdeutils/kdessh.po b/tde-i18n-ja/messages/kdeutils/kdessh.po
index ab1e2d7881c..b1a68c85a43 100644
--- a/tde-i18n-ja/messages/kdeutils/kdessh.po
+++ b/tde-i18n-ja/messages/kdeutils/kdessh.po
@@ -85,10 +85,10 @@ msgstr ""
 
 #: sshdlg.cpp:62
 msgid ""
-"The programs 'ssh' or 'kdesu_stub' cannot be found.\n"
+"The programs 'ssh' or 'tdesu_stub' cannot be found.\n"
 "Make sure your PATH is set correctly."
 msgstr ""
-"プログラム 'ssh' または 'kdesu_stub' が見つかりません。\n"
+"プログラム 'ssh' または 'tdesu_stub' が見つかりません。\n"
 "PATH が正しく設定されているか確認してください。"
 
 #: sshdlg.cpp:68
diff --git a/tde-i18n-ja/messages/kdeutils/klaptopdaemon.po b/tde-i18n-ja/messages/kdeutils/klaptopdaemon.po
index ecbedc78a2b..824c1a61a62 100644
--- a/tde-i18n-ja/messages/kdeutils/klaptopdaemon.po
+++ b/tde-i18n-ja/messages/kdeutils/klaptopdaemon.po
@@ -395,9 +395,9 @@ msgstr "KLaptopDaemon"
 
 #: daemondock.cpp:260
 msgid ""
-"PCMCIA cannot be enabled since kdesu cannot be found. Please make sure that it "
+"PCMCIA cannot be enabled since tdesu cannot be found. Please make sure that it "
 "is installed correctly."
-msgstr "PCMCIA を有効にできませんでした。kdesu が正しくインストールされているか確認してください。"
+msgstr "PCMCIA を有効にできませんでした。tdesu が正しくインストールされているか確認してください。"
 
 #: daemondock.cpp:264
 msgid "PCMCIA cannot be enabled just now."
diff --git a/tde-i18n-ja/messages/kdevelop/Makefile.in b/tde-i18n-ja/messages/kdevelop/Makefile.in
index c021069dec7..f6a241514fd 100644
--- a/tde-i18n-ja/messages/kdevelop/Makefile.in
+++ b/tde-i18n-ja/messages/kdevelop/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdevelop
+subdir = messages/tdevelop
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = kdevelop.po kdevdesigner.po kdevtipofday.po
-GMOFILES = kdevelop.gmo kdevdesigner.gmo kdevtipofday.gmo
+POFILES = tdevelop.po kdevdesigner.po kdevtipofday.po
+GMOFILES = tdevelop.gmo kdevdesigner.gmo kdevtipofday.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdevelop/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdevelop/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdevelop/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdevelop/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdevelop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdevelop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdevelop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdevelop/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdevelop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdevelop/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,12 +531,12 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=kdevelop.po Makefile.in kdevdesigner.po kdevtipofday.po Makefile.am 
+KDE_DIST=tdevelop.po Makefile.in kdevdesigner.po kdevtipofday.po Makefile.am 
 
 #>+ 10
-kdevelop.gmo: kdevelop.po
-	rm -f kdevelop.gmo; $(GMSGFMT) -o kdevelop.gmo $(srcdir)/kdevelop.po
-	test ! -f kdevelop.gmo || touch kdevelop.gmo
+tdevelop.gmo: tdevelop.po
+	rm -f tdevelop.gmo; $(GMSGFMT) -o tdevelop.gmo $(srcdir)/tdevelop.po
+	test ! -f tdevelop.gmo || touch tdevelop.gmo
 kdevdesigner.gmo: kdevdesigner.po
 	rm -f kdevdesigner.gmo; $(GMSGFMT) -o kdevdesigner.gmo $(srcdir)/kdevdesigner.po
 	test ! -f kdevdesigner.gmo || touch kdevdesigner.gmo
@@ -546,12 +546,12 @@ kdevtipofday.gmo: kdevtipofday.po
 
 #>+ 3
 clean-nls:
-	-rm -f  kdevelop.gmo kdevdesigner.gmo kdevtipofday.gmo
+	-rm -f  tdevelop.gmo kdevdesigner.gmo kdevtipofday.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in kdevelop kdevdesigner kdevtipofday ; do \
+	@for base in tdevelop kdevdesigner kdevtipofday ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -561,7 +561,7 @@ install-nls:
 
 #>+ 5
 uninstall-nls:
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdevelop.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdevelop.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdevdesigner.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdevtipofday.mo
 
@@ -590,10 +590,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdevelop/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdevelop/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdevelop/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdevelop/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdevelop/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdevelop/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdevelop/kdevelop.po b/tde-i18n-ja/messages/kdevelop/kdevelop.po
index 41ea6677937..691a4a0c1ae 100644
--- a/tde-i18n-ja/messages/kdevelop/kdevelop.po
+++ b/tde-i18n-ja/messages/kdevelop/kdevelop.po
@@ -1,4 +1,4 @@
-# translation of kdevelop.po to Japanese
+# translation of tdevelop.po to Japanese
 # Taiki Komoda <[email protected]>, 2002.
 # Hideki Ikemoto <[email protected]>, 2003, 2004.
 # Shimada Hirofumi <[email protected]>, 2004.
@@ -6,7 +6,7 @@
 # Fumiaki Okushi <[email protected]>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdevelop\n"
+"Project-Id-Version: tdevelop\n"
 "POT-Creation-Date: 2008-08-01 01:17+0200\n"
 "PO-Revision-Date: 2007-05-12 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
@@ -78,7 +78,7 @@ msgstr "ブラウザツールバー"
 msgid "Extra Toolbar"
 msgstr "拡張ツールバー"
 
-#. i18n: file ./src/kdevelopui.rc line 187
+#. i18n: file ./src/tdevelopui.rc line 187
 #: rc.cpp:177 rc.cpp:216
 #, no-c-format
 msgid "View Sessions Toolbar"
@@ -2451,7 +2451,7 @@ msgid ""
 "Only the selected entry will be used"
 msgstr ""
 
-#. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 25
+#. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 25
 #: rc.cpp:1644
 #, no-c-format
 msgid ""
@@ -2459,27 +2459,27 @@ msgid ""
 "Only the selected entry will be used"
 msgstr ""
 
-#. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 31
+#. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 31
 #: rc.cpp:1648
 #, no-c-format
 msgid "KDE Libs Headers"
 msgstr "KDE ライブラリのヘッダ"
 
-#. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 36
+#. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 36
 #: rc.cpp:1651
 #, no-c-format
 msgid "All KDE Headers"
 msgstr "すべての KDE ヘッダ"
 
-#. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 46
+#. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 46
 #: rc.cpp:1654
 #, no-c-format
 msgid ""
 "Decide if you want to restrict the Code Completion database to only the base "
-"kdelibs API or the entire KDE include structure"
+"tdelibs API or the entire KDE include structure"
 msgstr ""
 
-#. i18n: file ./languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui line 65
+#. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 65
 #: rc.cpp:1660
 #, no-c-format
 msgid ""
@@ -4093,7 +4093,7 @@ msgid ""
 "Adds subversion menus to project.\n"
 "\n"
 "NOTE: Unless you import the project\n"
-"out of kdevelop, you will not be able\n"
+"out of tdevelop, you will not be able\n"
 "to perform any subversion operations."
 msgstr ""
 
@@ -4356,9 +4356,9 @@ msgstr "あなたのリリース名を入力 (空白の場合 HEAD)"
 #, no-c-format
 msgid ""
 "Fill the field with the release or branch name (e.g. <i>"
-"make_it_cool, kdevelop_alpha5, ...</i>)"
+"make_it_cool, tdevelop_alpha5, ...</i>)"
 msgstr ""
-"リリース名またはブランチ名でフィールドを埋めてください (例 <i>make_it_cool, kdevelop_alpha5, ...</i>)"
+"リリース名またはブランチ名でフィールドを埋めてください (例 <i>make_it_cool, tdevelop_alpha5, ...</i>)"
 
 #. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
 #: rc.cpp:2910
@@ -8230,8 +8230,8 @@ msgstr "実行前に自動的にインストールする(&A)"
 #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
 #: rc.cpp:5205
 #, no-c-format
-msgid "Use &kdesu when installing"
-msgstr "インストール時に kdesu を使用(&K)"
+msgid "Use &tdesu when installing"
+msgstr "インストール時に tdesu を使用(&K)"
 
 #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
 #: rc.cpp:5208
@@ -16031,8 +16031,8 @@ msgid "Close this view"
 msgstr "このビューを閉じる"
 
 #: languages/cpp/debugger/stty.cpp:333 languages/ruby/debugger/stty.cpp:317
-msgid "kdevelop: Debug application console"
-msgstr "kdevelop: デバッグアプリケーションコンソール"
+msgid "tdevelop: Debug application console"
+msgstr "tdevelop: デバッグアプリケーションコンソール"
 
 #: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
 msgid ""
@@ -16042,13 +16042,13 @@ msgstr ""
 "これは有効な Qt3 インクルードディレクトリではないようです。\n"
 "他のディレクトリを選択してください。"
 
-#: languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp:92
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
 #: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
 #: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
 msgid "Invalid Directory"
 msgstr "無効なディレクトリ"
 
-#: languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp:92
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
 msgid ""
 "This doesn't appear to be a valid KDE include directory.\n"
 "Please select a different directory."
@@ -18615,7 +18615,7 @@ msgid ""
 "you have to add KDevelop's installation path to the environment variable "
 "KDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
 "Example for BASH users:\n"
-"export KDEDIRS=/path/to/kdevelop:$KDEDIRS && kbuildsycoca"
+"export KDEDIRS=/path/to/tdevelop:$KDEDIRS && kbuildsycoca"
 msgstr ""
 
 #: src/simplemainwindow.cpp:105
@@ -18820,10 +18820,10 @@ msgstr "<b>プロジェクトオプション</b><p>プロジェクトのオプ�
 
 #: src/projectmanager.cpp:133
 msgid ""
-"*.kdevelop|KDevelop 3 Project Files\n"
+"*.tdevelop|KDevelop 3 Project Files\n"
 "*.kdevprj|KDevelop 2 Project Files"
 msgstr ""
-"*.kdevelop|KDevelop 3 プロジェクトファイル\n"
+"*.tdevelop|KDevelop 3 プロジェクトファイル\n"
 "*.kdevprj|KDevelop 2 プロジェクトファイル"
 
 #: kdevdesigner/designer/mainwindow.cpp:3085 src/projectmanager.cpp:135
@@ -18905,8 +18905,8 @@ msgid "Invalid URL."
 msgstr "無効なURL"
 
 #: src/projectmanager.cpp:623
-msgid "You do not have 'kdevprj2kdevelop' installed."
-msgstr "'kdevprj2kdevelop' がインストールされていません。"
+msgid "You do not have 'kdevprj2tdevelop' installed."
+msgstr "'kdevprj2tdevelop' がインストールされていません。"
 
 #: src/splashscreen.cpp:77
 #, c-format
@@ -24768,7 +24768,7 @@ msgstr "サブディレクトリを削除しますか？"
 msgid ""
 "Couldn't delete subproject.\n"
 "This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of kdevelop when runfrom a shell."
+"the output of tdevelop when runfrom a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:958
@@ -25305,7 +25305,7 @@ msgstr "実行しない"
 msgid ""
 "Couldn't delete Function Scope.\n"
 "This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of kdevelop when run from a shell."
+"the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2276
@@ -25316,7 +25316,7 @@ msgstr "関数スコープの削除に失敗"
 msgid ""
 "Couldn't delete Include Scope.\n"
 "This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of kdevelop when run from a shell."
+"the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2284
@@ -25327,7 +25327,7 @@ msgstr "インクルードスコープの削除に失敗"
 msgid ""
 "Couldn't delete Scope.\n"
 "This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of kdevelop when run from a shell."
+"the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2296
@@ -25509,13 +25509,13 @@ msgid ""
 "<b>Install</b>"
 "<p>Runs <b>make install</b> command from the project directory with root "
 "privileges."
-"<br>It is executed via kdesu command."
+"<br>It is executed via tdesu command."
 "<br>Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 "<b>インストール</b>"
 "<p>プロジェクトディレクトリから <b>make install</b> を root 権限で実行します。"
-"<br>kdesu コマンドを経由します。"
+"<br>tdesu コマンドを経由します。"
 "<br>環境変数と make 引数は、プロジェクト設定ダイアログの「Make オプション」タブで指定できます。"
 
 #: buildtools/custommakefiles/customprojectpart.cpp:136
@@ -26403,13 +26403,13 @@ msgid ""
 "<qt><b>Install as root user</b>"
 "<p>Runs <b>make install</b> command from the directory of the selected "
 "subproject with root privileges."
-"<br> It is executed via kdesu command."
+"<br> It is executed via tdesu command."
 "<br> Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab.</qt>"
 msgstr ""
 "<qt><b>root ユーザでインストール</b>"
 "<p>選択したサブプロジェクトのディレクトリから <b>make install</b> を root 権限で実行します。"
-"<br>kdesu コマンドを経由します。"
+"<br>tdesu コマンドを経由します。"
 "<br>環境変数と make の引数は、プロジェクトの設定ダイアログの「Make オプション」タブで指定できます。</qt>"
 
 #: buildtools/autotools/autosubprojectview.cpp:263
@@ -29123,7 +29123,7 @@ msgstr "画像を選択"
 #~ msgid "Add New Files To Project"
 #~ msgstr "プロジェクトに新しいファイルを追加"
 
-#~ msgid "<b>Add New Files To Project</b><p>Adds files created outside of kdevelop to the project."
+#~ msgid "<b>Add New Files To Project</b><p>Adds files created outside of tdevelop to the project."
 #~ msgstr "<b>プロジェクトに新しいファイルを追加</b><p>Kdevelop 以外で作成されたファイルをプロジェクトに追加します。"
 
 #, fuzzy
diff --git a/tde-i18n-ja/messages/kdewebdev/Makefile.in b/tde-i18n-ja/messages/kdewebdev/Makefile.in
index aaf1b05da40..d763a488dc5 100644
--- a/tde-i18n-ja/messages/kdewebdev/Makefile.in
+++ b/tde-i18n-ja/messages/kdewebdev/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdewebdev
+subdir = messages/tdewebdev
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdewebdev/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdewebdev/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -602,10 +602,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdewebdev/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdewebdev/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdewebdev/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdewebdev/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdewebdev/klinkstatus.po b/tde-i18n-ja/messages/kdewebdev/klinkstatus.po
index 6a9cb5c9e1a..4c5ac7e774b 100644
--- a/tde-i18n-ja/messages/kdewebdev/klinkstatus.po
+++ b/tde-i18n-ja/messages/kdewebdev/klinkstatus.po
@@ -224,11 +224,11 @@ msgstr "[email protected]"
 msgid ""
 "A Link Checker.\n"
 "\n"
-"KLinkStatus belongs to the kdewebdev module from KDE."
+"KLinkStatus belongs to the tdewebdev module from KDE."
 msgstr ""
 "リンクチェッカー\n"
 "\n"
-"KLinkStatus は KDE の kdewebdev モジュールの一つです。"
+"KLinkStatus は KDE の tdewebdev モジュールの一つです。"
 
 #: main.cpp:40
 msgid "Document to open"
diff --git a/tde-i18n-ja/messages/kdewebdev/quanta.po b/tde-i18n-ja/messages/kdewebdev/quanta.po
index 08ea8faee17..dccbb9dfab3 100644
--- a/tde-i18n-ja/messages/kdewebdev/quanta.po
+++ b/tde-i18n-ja/messages/kdewebdev/quanta.po
@@ -439,7 +439,7 @@ msgid ""
 "<h3>Will you help make a difference?</h3></div>\n"
 "&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
 "(online money transfer or credit card), visit our <a "
-"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
+"href=\"http://tdewebdev.org/donate.php\">donation page</a>.\n"
 "<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
 "discuss corporate sponsorship contact the project manager:"
 "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
@@ -451,8 +451,8 @@ msgstr ""
 #: rc.cpp:229
 #, no-c-format
 msgid ""
-"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
-msgstr "Paypal を使って <a href=\"http://kdewebdev.org/donate.php\">寄付</a> をする。"
+"<a href=\"http://tdewebdev.org/donate.php\">Donate</a> through  PayPal now."
+msgstr "Paypal を使って <a href=\"http://tdewebdev.org/donate.php\">寄付</a> をする。"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 25
 #: rc.cpp:232
@@ -4968,8 +4968,8 @@ msgstr "kate"
 #. i18n: file ./scripts/scriptinfo.kmdr line 288
 #: rc.cpp:3214
 #, no-c-format
-msgid "kdevelop"
-msgstr "kdevelop"
+msgid "tdevelop"
+msgstr "tdevelop"
 
 #. i18n: file ./scripts/scriptinfo.kmdr line 303
 #: rc.cpp:3217
@@ -5044,8 +5044,8 @@ msgid ""
 "Lead Developer - Andras Mantia <a "
 "href=\"mailto:[email protected]?subject=ScriptInfo\">[email protected]</a><br />"
 "Kommander - Michal Rudolf <a "
-"href=\"mailto:[email protected]?subject=ScriptInfo\">"
-"[email protected]</a><br />Project Lead - Eric Laffoon <a "
+"href=\"mailto:[email protected]?subject=ScriptInfo\">"
+"[email protected]</a><br />Project Lead - Eric Laffoon <a "
 "href=\"mailto:[email protected]?subject=ScriptInfo\">[email protected]</a></p>\n"
 "</body></html>\n"
 msgstr ""
@@ -9200,14 +9200,14 @@ msgstr ""
 msgid ""
 "<p>...that we have additional mailing lists to support our users? Lists include "
 "Kommander and web development help.<b><a "
-"href=\"http://mail.kdewebdev.org/mailman/listinfo\">Click here to see</a></b>.\n"
+"href=\"http://mail.tdewebdev.org/mailman/listinfo\">Click here to see</a></b>.\n"
 "</p>\n"
 msgstr ""
 
 #: tips.cpp:129
 msgid ""
 "<p>...that you can help to financially support our program of sponsoring "
-"developers? <b><a href=\"http://kdewebdev.org/donate.php\">"
+"developers? <b><a href=\"http://tdewebdev.org/donate.php\">"
 "Click here to help</a></b>.\n"
 "</p>\n"
 msgstr ""
@@ -9315,7 +9315,7 @@ msgstr ""
 msgid ""
 "<p>...that Quanta comes with a number of applications that run a plug ins? "
 "Quanta can also load other programs if they are installed including HTML Tidy, "
-"Cervisia and Kompare. Make sure you have HTML Tidy and the kdesdk module "
+"Cervisia and Kompare. Make sure you have HTML Tidy and the tdesdk module "
 "installed to use them all.\n"
 "</p>\n"
 msgstr ""
@@ -9466,7 +9466,7 @@ msgstr ""
 msgid ""
 "<p>...that you can contribute to <b>Quanta's public repository</b> "
 "of resources? Just <a "
-"href=\"mailto:[email protected]?subject=Quanta%20Resource\">"
+"href=\"mailto:[email protected]?subject=Quanta%20Resource\">"
 "email it here</a>.\n"
 "</p>\n"
 msgstr ""
@@ -9682,12 +9682,12 @@ msgstr "ツールバーをメールで送信"
 #: src/quanta.cpp:2740
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] toolbar.\n"
+" This is a Quanta Plus [http://quanta.tdewebdev.org] toolbar.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
 "やあ、\n"
-"これは Quanta Plus [http://quanta.kdewebdev.org] のツールバーです。\n"
+"これは Quanta Plus [http://quanta.tdewebdev.org] のツールバーです。\n"
 "\n"
 "楽しんでね。\n"
 
@@ -9769,12 +9769,12 @@ msgstr "DTD をメールで送信"
 #: src/quanta.cpp:3614
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] DTEP definition tarball.\n"
+" This is a Quanta Plus [http://quanta.tdewebdev.org] DTEP definition tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
 "やあ、\n"
-"これは Quanta Plus [http://quanta.kdewebdev.org] の DTEP 定義の TAR 書庫です。\n"
+"これは Quanta Plus [http://quanta.tdewebdev.org] の DTEP 定義の TAR 書庫です。\n"
 "\n"
 "楽しんでね。\n"
 
@@ -10544,8 +10544,8 @@ msgid "comparing of files by content"
 msgstr "ファイルを内容で比較"
 
 #: src/quanta_init.cpp:1426
-msgid "Control Center (kdebase)"
-msgstr "コントロールセンター (kdebase)"
+msgid "Control Center (tdebase)"
+msgstr "コントロールセンター (tdebase)"
 
 #: src/quanta_init.cpp:1429 src/quanta_init.cpp:1436
 msgid "preview browser configuration"
@@ -12072,12 +12072,12 @@ msgstr "テンプレートをメールで送信"
 #: treeviews/templatestreeview.cpp:987
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
+" This is a Quanta Plus [http://quanta.tdewebdev.org] template tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
 "やあ、\n"
-"これは Quanta Plus [http://quanta.kdewebdev.org] のテンプレート TAR 書庫です。\n"
+"これは Quanta Plus [http://quanta.tdewebdev.org] のテンプレート TAR 書庫です。\n"
 "\n"
 "楽しんでね。\n"
 
@@ -12174,12 +12174,12 @@ msgstr "スクリプトをメールで送信"
 #: treeviews/scripttreeview.cpp:275
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
+" This is a Quanta Plus [http://quanta.tdewebdev.org] script tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
 "やあ、\n"
-"これは Quanta Plus [http://quanta.kdewebdev.org] のスクリプト TAR 書庫です。\n"
+"これは Quanta Plus [http://quanta.tdewebdev.org] のスクリプト TAR 書庫です。\n"
 "\n"
 "楽しんでね。\n"