Initial kde-tde rename

216 files changed, 2023 insertions, 2023 deletions

diff --git a/tde-i18n-cy/Makefile.in b/tde-i18n-cy/Makefile.in
index 76b3e843ea9..2ace9b7b146 100644
--- a/tde-i18n-cy/Makefile.in
+++ b/tde-i18n-cy/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-cy/acinclude.m4 b/tde-i18n-cy/acinclude.m4
index 46ad205e449..7d9fdee4132 100644
--- a/tde-i18n-cy/acinclude.m4
+++ b/tde-i18n-cy/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-cy/configure b/tde-i18n-cy/configure
index 44be8f1e5cb..18a25429782 100755
--- a/tde-i18n-cy/configure
+++ b/tde-i18n-cy/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-cy
+ PACKAGE=tde-i18n-cy
  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)'
 
 
 
@@ -4123,39 +4123,39 @@ ac_config_files="$ac_config_files 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
@@ -4721,23 +4721,23 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES 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;}
@@ -4942,7 +4942,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-cy/configure.in b/tde-i18n-cy/configure.in
index 95a6b6d31b0..c4475e585dc 100644
--- a/tde-i18n-cy/configure.in
+++ b/tde-i18n-cy/configure.in
@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
 dnl =======================================================
 
 AC_INIT(messages/Makefile.am)
-AM_INIT_AUTOMAKE(kde-i18n-cy, "3.5.10")
+AM_INIT_AUTOMAKE(tde-i18n-cy, "3.5.10")
 AM_CONFIG_HEADER(config.h)
 AC_SUBST(AUTODIRS)
 AM_KDE_WITH_NLS
@@ -15,23 +15,23 @@ AC_PROG_LN_S
 KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ 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-cy/messages/Makefile.in b/tde-i18n-cy/messages/Makefile.in
index 50a30daa307..8979c596066 100644
--- a/tde-i18n-cy/messages/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 #>- 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-cy/messages/kdeaccessibility/Makefile.in b/tde-i18n-cy/messages/kdeaccessibility/Makefile.in
index 73dcebc42c1..c85ff80feb9 100644
--- a/tde-i18n-cy/messages/kdeaccessibility/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdeaccessibility/kbstateapplet.po b/tde-i18n-cy/messages/kdeaccessibility/kbstateapplet.po
index 2a8129efec0..f02c5b5d97f 100644
--- a/tde-i18n-cy/messages/kdeaccessibility/kbstateapplet.po
+++ b/tde-i18n-cy/messages/kdeaccessibility/kbstateapplet.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaccessibility/kbstateapplet.po\n"
+"Project-Id-Version: ../cy/messages//tdeaccessibility/kbstateapplet.po\n"
 "POT-Creation-Date: 2005-10-02 02:46+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/Makefile.in b/tde-i18n-cy/messages/kdeaddons/Makefile.in
index 14170cfe96f..856f5947a39 100644
--- a/tde-i18n-cy/messages/kdeaddons/Makefile.in
+++ b/tde-i18n-cy/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 \
@@ -854,10 +854,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-cy/messages/kdeaddons/ark_plugin.po b/tde-i18n-cy/messages/kdeaddons/ark_plugin.po
index b0945689be3..5822221fbc5 100644
--- a/tde-i18n-cy/messages/kdeaddons/ark_plugin.po
+++ b/tde-i18n-cy/messages/kdeaddons/ark_plugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/ark_plugin.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/ark_plugin.po\n"
 "POT-Creation-Date: 2006-10-17 02:38+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/atlantikdesigner.po b/tde-i18n-cy/messages/kdeaddons/atlantikdesigner.po
index 0bc709e01d1..ec91349e0be 100644
--- a/tde-i18n-cy/messages/kdeaddons/atlantikdesigner.po
+++ b/tde-i18n-cy/messages/kdeaddons/atlantikdesigner.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/atlantikdesigner.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/atlantikdesigner.po\n"
 "POT-Creation-Date: 2004-12-29 14:56+0100\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
diff --git a/tde-i18n-cy/messages/kdeaddons/babelfish.po b/tde-i18n-cy/messages/kdeaddons/babelfish.po
index f2fdc39b078..83ef146d3aa 100644
--- a/tde-i18n-cy/messages/kdeaddons/babelfish.po
+++ b/tde-i18n-cy/messages/kdeaddons/babelfish.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/babelfish.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/babelfish.po\n"
 "POT-Creation-Date: 2008-04-08 02:02+0200\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
diff --git a/tde-i18n-cy/messages/kdeaddons/dub.po b/tde-i18n-cy/messages/kdeaddons/dub.po
index 8b9a605acdd..05aafb3ee92 100644
--- a/tde-i18n-cy/messages/kdeaddons/dub.po
+++ b/tde-i18n-cy/messages/kdeaddons/dub.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/dub.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/dub.po\n"
 "POT-Creation-Date: 2004-10-12 01:18+0200\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
diff --git a/tde-i18n-cy/messages/kdeaddons/katefiletemplates.po b/tde-i18n-cy/messages/kdeaddons/katefiletemplates.po
index b120ab4d9eb..da75e0ac3c8 100644
--- a/tde-i18n-cy/messages/kdeaddons/katefiletemplates.po
+++ b/tde-i18n-cy/messages/kdeaddons/katefiletemplates.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/katefiletemplates.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/katefiletemplates.po\n"
 "POT-Creation-Date: 2007-10-02 01:15+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/katekjswrapper.po b/tde-i18n-cy/messages/kdeaddons/katekjswrapper.po
index 62a6249ea84..539bcbf72b3 100644
--- a/tde-i18n-cy/messages/kdeaddons/katekjswrapper.po
+++ b/tde-i18n-cy/messages/kdeaddons/katekjswrapper.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/katekjswrapper.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/katekjswrapper.po\n"
 "POT-Creation-Date: 2004-10-30 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/katetabbarextension.po b/tde-i18n-cy/messages/kdeaddons/katetabbarextension.po
index 27a3f64e45b..b2cae022435 100644
--- a/tde-i18n-cy/messages/kdeaddons/katetabbarextension.po
+++ b/tde-i18n-cy/messages/kdeaddons/katetabbarextension.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/katetabbarextension.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/katetabbarextension.po\n"
 "POT-Creation-Date: 2008-02-22 01:36+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/kbinaryclock.po b/tde-i18n-cy/messages/kdeaddons/kbinaryclock.po
index 41a4def519a..503d748223b 100644
--- a/tde-i18n-cy/messages/kdeaddons/kbinaryclock.po
+++ b/tde-i18n-cy/messages/kdeaddons/kbinaryclock.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/kbinaryclock.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/kbinaryclock.po\n"
 "POT-Creation-Date: 2008-07-08 01:23+0200\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
diff --git a/tde-i18n-cy/messages/kdeaddons/kfile_lnk.po b/tde-i18n-cy/messages/kdeaddons/kfile_lnk.po
index d9e072dd6ca..650efc5e59e 100644
--- a/tde-i18n-cy/messages/kdeaddons/kfile_lnk.po
+++ b/tde-i18n-cy/messages/kdeaddons/kfile_lnk.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/kfile_lnk.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/kfile_lnk.po\n"
 "POT-Creation-Date: 2004-10-12 01:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/kmathapplet.po b/tde-i18n-cy/messages/kdeaddons/kmathapplet.po
index 49b7bb9921c..9bd4aac5ef6 100644
--- a/tde-i18n-cy/messages/kdeaddons/kmathapplet.po
+++ b/tde-i18n-cy/messages/kdeaddons/kmathapplet.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/kmathapplet.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/kmathapplet.po\n"
 "POT-Creation-Date: 2004-12-17 01:25+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeaddons/konqsidebar_news.po b/tde-i18n-cy/messages/kdeaddons/konqsidebar_news.po
index ff84a253dbf..a63b4fa5c1c 100644
--- a/tde-i18n-cy/messages/kdeaddons/konqsidebar_news.po
+++ b/tde-i18n-cy/messages/kdeaddons/konqsidebar_news.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/konqsidebar_news.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/konqsidebar_news.po\n"
 "POT-Creation-Date: 2004-12-11 01:24+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -73,7 +73,7 @@ msgstr ""
 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 ""
 
 #: sidebar_news.cpp:80
diff --git a/tde-i18n-cy/messages/kdeaddons/lyrics.po b/tde-i18n-cy/messages/kdeaddons/lyrics.po
index 56a9be19833..2451fbf7e57 100644
--- a/tde-i18n-cy/messages/kdeaddons/lyrics.po
+++ b/tde-i18n-cy/messages/kdeaddons/lyrics.po
@@ -202,7 +202,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 ""
@@ -212,6 +212,6 @@ msgstr ""
 "bosibl nad ydyn nhw'n bresennol, neu'n anghywir. Os felly, ni fydd yr ategyn "
 "Lyrics ddim yn gallu cael hyd i'r geiriau nes bod y priodweddion hyn wedi'u "
 "trwsio (cewch eu trwsio gan ddefnyddio'r golygydd tagiau).\n"
-" Cynghoryn: Galla'r ategyn tag lucky, sy'n bresennol ym modiwl kdeaddons, "
+" Cynghoryn: Galla'r ategyn tag lucky, sy'n bresennol ym modiwl tdeaddons, "
 "geisio dyfalu priodweddion megis teitl ac awdur o enw ffeil y gân. Gall ei "
 "alluogi wella'r siawns o gael hyd i'r geiriau."
diff --git a/tde-i18n-cy/messages/kdeaddons/rellinks.po b/tde-i18n-cy/messages/kdeaddons/rellinks.po
index 5d4058e6cf4..af5035c5f10 100644
--- a/tde-i18n-cy/messages/kdeaddons/rellinks.po
+++ b/tde-i18n-cy/messages/kdeaddons/rellinks.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeaddons/rellinks.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/rellinks.po\n"
 "POT-Creation-Date: 2005-09-05 02:42+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeadmin/Makefile.in b/tde-i18n-cy/messages/kdeadmin/Makefile.in
index 599bd09331b..d672bc1fea6 100644
--- a/tde-i18n-cy/messages/kdeadmin/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdeartwork/Makefile.in b/tde-i18n-cy/messages/kdeartwork/Makefile.in
index 55240e62a6f..41fa1b43403 100644
--- a/tde-i18n-cy/messages/kdeartwork/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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-cy/messages/kdeartwork/klock.po b/tde-i18n-cy/messages/kdeartwork/klock.po
index 39a2f9e3a69..4805d5b659e 100644
--- a/tde-i18n-cy/messages/kdeartwork/klock.po
+++ b/tde-i18n-cy/messages/kdeartwork/klock.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeartwork/klock.po\n"
+"Project-Id-Version: ../cy/messages//tdeartwork/klock.po\n"
 "POT-Creation-Date: 2008-07-08 01:23+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeartwork/kpartsaver.po b/tde-i18n-cy/messages/kdeartwork/kpartsaver.po
index 1dcc8e1d59e..55591558a94 100644
--- a/tde-i18n-cy/messages/kdeartwork/kpartsaver.po
+++ b/tde-i18n-cy/messages/kdeartwork/kpartsaver.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeartwork/kpartsaver.po\n"
+"Project-Id-Version: ../cy/messages//tdeartwork/kpartsaver.po\n"
 "POT-Creation-Date: 2007-02-26 02:46+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeartwork/kxsconfig.po b/tde-i18n-cy/messages/kdeartwork/kxsconfig.po
index 047b81fc5bf..fa72b8f12f6 100644
--- a/tde-i18n-cy/messages/kdeartwork/kxsconfig.po
+++ b/tde-i18n-cy/messages/kdeartwork/kxsconfig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeartwork/kxsconfig.po\n"
+"Project-Id-Version: ../cy/messages//tdeartwork/kxsconfig.po\n"
 "POT-Creation-Date: 2007-05-22 02:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdebase/Makefile.in b/tde-i18n-cy/messages/kdebase/Makefile.in
index ff9286c5eec..483b1ff12de 100644
--- a/tde-i18n-cy/messages/kdebase/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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 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 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 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 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 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 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 
 
 #>+ 466
 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
@@ -993,21 +993,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 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 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 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 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 ;\
@@ -1030,7 +1030,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
@@ -1051,7 +1051,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
@@ -1065,7 +1065,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
@@ -1096,7 +1096,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
@@ -1107,7 +1107,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
@@ -1116,7 +1116,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
@@ -1129,19 +1129,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
@@ -1170,7 +1170,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
@@ -1198,10 +1198,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-cy/messages/kdebase/drkonqi.po b/tde-i18n-cy/messages/kdebase/drkonqi.po
index a352b03c8f6..3615dda0c50 100644
--- a/tde-i18n-cy/messages/kdebase/drkonqi.po
+++ b/tde-i18n-cy/messages/kdebase/drkonqi.po
@@ -168,8 +168,8 @@ msgid "Startup ID of the program"
 msgstr "Dynodiad (ID) cychwyn y rhaglen"
 
 #: main.cpp:55
-msgid "The program was started by kdeinit"
-msgstr "Dechreuwyd y rhaglen gan kdeinit"
+msgid "The program was started by tdeinit"
+msgstr "Dechreuwyd y rhaglen gan tdeinit"
 
 #: main.cpp:56
 msgid "Disable arbitrary disk access"
diff --git a/tde-i18n-cy/messages/kdebase/kcmcrypto.po b/tde-i18n-cy/messages/kdebase/kcmcrypto.po
index 44464237c7b..dc9950aead6 100644
--- a/tde-i18n-cy/messages/kdebase/kcmcrypto.po
+++ b/tde-i18n-cy/messages/kdebase/kcmcrypto.po
@@ -710,11 +710,11 @@ 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 ""
 "Methu gweithredu Kleopatra.  Efallai bydd rhaid i chi arsefydlu neu diweddaru'r "
-"pecyn kdepim."
+"pecyn tdepim."
 
 #: crypto.cpp:2030
 msgid ""
diff --git a/tde-i18n-cy/messages/kdebase/kcmkeys.po b/tde-i18n-cy/messages/kdebase/kcmkeys.po
index 86dc86a2395..5ae2c631f4b 100644
--- a/tde-i18n-cy/messages/kdebase/kcmkeys.po
+++ b/tde-i18n-cy/messages/kdebase/kcmkeys.po
@@ -318,395 +318,395 @@ msgstr ""
 msgid "Application Missing"
 msgstr "Cymhwysiad ar Goll"
 
-#: ../../kwin/kwinbindings.cpp:18
+#: ../../twin/twinbindings.cpp:18
 msgid "System"
 msgstr "Cysawd"
 
-#: ../../kwin/kwinbindings.cpp:20
+#: ../../twin/twinbindings.cpp:20
 msgid "Navigation"
 msgstr "Llywio"
 
-#: ../../kwin/kwinbindings.cpp:21
+#: ../../twin/twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "Cerdded Drwy Ffenestri"
 
-#: ../../kwin/kwinbindings.cpp:22
+#: ../../twin/twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "Cerdded Drwy Ffenestri (Am yn ôl)"
 
-#: ../../kwin/kwinbindings.cpp:23
+#: ../../twin/twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "Cerdded Drwy Benbyrddau"
 
-#: ../../kwin/kwinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Cerdded Drwy Benbyrddau (Am yn ôl)"
 
-#: ../../kwin/kwinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "Cerdded Drwy'r Restr Benbyrddau"
 
-#: ../../kwin/kwinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Cerdded Drwy'r Restr Benbyrddau (Am yn ôl)"
 
-#: ../../kwin/kwinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:28
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: ../../kwin/kwinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "Dewislen Gweithredoedd Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:30
 msgid "Close Window"
 msgstr "Cau'r Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "Ehangu'r Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "Ehangu'r Ffenestr yn Fertigol"
 
-#: ../../kwin/kwinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "Ehangu'r Ffenestr yn Llorweddol"
 
-#: ../../kwin/kwinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "Rholio'r Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:42
 msgid "Move Window"
 msgstr "Symud y Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "Newid Maint y Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "Codi'r Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "Gostwng y Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "Newid Codi/Gostwng Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "Gwneud i'r Ffenestr Lenwi'r Sgrîn"
 
-#: ../../kwin/kwinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "Cuddio Ymyl y Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "Cadw'r Ffenestr Dros y Lleill"
 
-#: ../../kwin/kwinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "Cadw'r Ffenestr Dan y Lleill"
 
-#: ../../kwin/kwinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "Gweithredu'r Ffenest sy'n Gofyn am Sylw"
 
-#: ../../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 "Pacio'r Ffenestr i'r Dde"
 
-#: ../../kwin/kwinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "Pacio'r Ffenestr i'r Chwith"
 
-#: ../../kwin/kwinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "Pacio'r Ffenestr i Fyny"
 
-#: ../../kwin/kwinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "Pacio'r Ffenestr i Lawr"
 
-#: ../../kwin/kwinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "Pacio ac Ehangu'r Ffenestr yn Llorweddol"
 
-#: ../../kwin/kwinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "Pacio ac Ehangu'r Ffenestr yn Fertigol"
 
-#: ../../kwin/kwinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "Pacio a Lleihau'r Ffenestr yn Llorweddol"
 
-#: ../../kwin/kwinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "Pacio a Lleihau'r Ffenestr yn Fertigol"
 
-#: ../../kwin/kwinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "Ffenestr a Phenbwrdd"
 
-#: ../../kwin/kwinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "Cadw'r Ffenestr ar Bob Penbwrdd"
 
-#: ../../kwin/kwinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "Ffenestr i Benbwrdd 1"
 
-#: ../../kwin/kwinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: ../../kwin/kwinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "Ffenestr i Benbwrdd 3"
 
-#: ../../kwin/kwinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "Ffenestr i Benbwrdd 4"
 
-#: ../../kwin/kwinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "Ffenestr i Benbwrdd 5"
 
-#: ../../kwin/kwinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "Ffenestr i Benbwrdd 6"
 
-#: ../../kwin/kwinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: ../../kwin/kwinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: ../../kwin/kwinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: ../../kwin/kwinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "Ffenestr i Benbwrdd 10"
 
-#: ../../kwin/kwinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "Ffenestr i Benbwrdd 11"
 
-#: ../../kwin/kwinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "Ffenestr i Benbwrdd 12"
 
-#: ../../kwin/kwinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "Ffenestr i Benbwrdd 13"
 
-#: ../../kwin/kwinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "Ffenestr i Benbwrdd 14"
 
-#: ../../kwin/kwinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "Ffenestr i Benbwrdd 15"
 
-#: ../../kwin/kwinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "Ffenestr i Benbwrdd 16"
 
-#: ../../kwin/kwinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:97
 #, fuzzy
 msgid "Window to Desktop 17"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: ../../kwin/kwinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:98
 #, fuzzy
 msgid "Window to Desktop 18"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: ../../kwin/kwinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:99
 #, fuzzy
 msgid "Window to Desktop 19"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: ../../kwin/kwinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:100
 #, fuzzy
 msgid "Window to Desktop 20"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: ../../kwin/kwinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "Ffenestr i'r Penbwrdd Nesaf"
 
-#: ../../kwin/kwinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "Ffenestr i'r Penbwrdd Blaenorol"
 
-#: ../../kwin/kwinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:103
 #, fuzzy
 msgid "Window One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: ../../kwin/kwinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:104
 #, fuzzy
 msgid "Window One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: ../../kwin/kwinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:105
 #, fuzzy
 msgid "Window One Desktop Up"
 msgstr "Ffenestr a Phenbwrdd"
 
-#: ../../kwin/kwinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:106
 #, fuzzy
 msgid "Window One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: ../../kwin/kwinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "Newid Penbwrdd"
 
-#: ../../kwin/kwinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "Newid i Benbwrdd 1"
 
-#: ../../kwin/kwinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "Newid i Benbwrdd 2"
 
-#: ../../kwin/kwinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "Newid i Benbwrdd 3"
 
-#: ../../kwin/kwinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "Newid i Benbwrdd 4"
 
-#: ../../kwin/kwinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "Newid i Benbwrdd 5"
 
-#: ../../kwin/kwinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "Newid i Benbwrdd 6"
 
-#: ../../kwin/kwinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "Newid i Benbwrdd 7"
 
-#: ../../kwin/kwinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "Newid i Benbwrdd 8"
 
-#: ../../kwin/kwinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "Newid i Benbwrdd 9"
 
-#: ../../kwin/kwinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "Newid i Benbwrdd 10"
 
-#: ../../kwin/kwinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "Newid i Benbwrdd 11"
 
-#: ../../kwin/kwinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "Newid i Benbwrdd 12"
 
-#: ../../kwin/kwinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "Newid i Benbwrdd 13"
 
-#: ../../kwin/kwinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "Newid i Benbwrdd 14"
 
-#: ../../kwin/kwinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "Newid i Benbwrdd 15"
 
-#: ../../kwin/kwinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "Newid i Benbwrdd 16"
 
-#: ../../kwin/kwinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:125
 #, fuzzy
 msgid "Switch to Desktop 17"
 msgstr "Newid i Benbwrdd 7"
 
-#: ../../kwin/kwinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:126
 #, fuzzy
 msgid "Switch to Desktop 18"
 msgstr "Newid i Benbwrdd 8"
 
-#: ../../kwin/kwinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:127
 #, fuzzy
 msgid "Switch to Desktop 19"
 msgstr "Newid i Benbwrdd 9"
 
-#: ../../kwin/kwinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:128
 #, fuzzy
 msgid "Switch to Desktop 20"
 msgstr "Newid i Benbwrdd 2"
 
-#: ../../kwin/kwinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: ../../kwin/kwinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "Newid i'r Penbwrdd Blaenorol"
 
-#: ../../kwin/kwinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: ../../kwin/kwinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: ../../kwin/kwinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "Newid Un Penbwrdd i Fyny "
 
-#: ../../kwin/kwinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: ../../kwin/kwinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "Efelychiad Llygoden"
 
-#: ../../kwin/kwinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "Lladd Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "Llunsgrîn Ffenestr"
 
-#: ../../kwin/kwinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "Llunsgrîn Benbwrdd"
 
-#: ../../kwin/kwinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:145
 #, fuzzy
 msgid "Block Global Shortcuts"
 msgstr "&Byrlwybrau Eang"
diff --git a/tde-i18n-cy/messages/kdebase/kcmkwindecoration.po b/tde-i18n-cy/messages/kdebase/kcmkwindecoration.po
index 881d2c7b225..1acaecb78ca 100644
--- a/tde-i18n-cy/messages/kdebase/kcmkwindecoration.po
+++ b/tde-i18n-cy/messages/kdebase/kcmkwindecoration.po
@@ -1,11 +1,11 @@
-# translation of kcmkwindecoration.po to Cymraeg
+# translation of kcmtwindecoration.po to Cymraeg
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
 #
 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: 2004-07-03 22:37+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -85,7 +85,7 @@ msgstr "Dewislen"
 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."
@@ -93,24 +93,24 @@ msgstr ""
 "Dewiswch yr addurniad ffenestr. Dyma golwg a theimlad ffiniau ffenestr a dolen "
 "y ffenestr."
 
-#: kwindecoration.cpp:95
+#: twindecoration.cpp:95
 msgid "Decoration Options"
 msgstr "Dewisiadau Addurniadau"
 
-#: kwindecoration.cpp:105
+#: twindecoration.cpp:105
 #, fuzzy
 msgid "B&order size:"
 msgstr "Maint ffin: Bach Iawn"
 
-#: kwindecoration.cpp:108
+#: twindecoration.cpp:108
 msgid "Use this combobox to change the border size of the decoration."
 msgstr ""
 
-#: kwindecoration.cpp:124
+#: twindecoration.cpp:124
 msgid "&Show window button tooltips"
 msgstr "&Dangos cynghorion offer botymau ffenestri"
 
-#: 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."
@@ -118,11 +118,11 @@ msgstr ""
 "Bydd galluogi'r blwch brith yma'n dangos cynghorion offer botymau ffenestri. Os "
 "yw'r blwch yma wedi'i ddiffodd, ni ddengys cynghorion offer botymau ffenestri."
 
-#: kwindecoration.cpp:130
+#: twindecoration.cpp:130
 msgid "Use custom titlebar button &positions"
 msgstr "Defnyddio &lleoliadau botymau bar teitl addasiedig"
 
-#: 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."
@@ -130,61 +130,61 @@ msgstr ""
 "Gellir canfod y gosodiadau perthnasol yn y Tab \"Botymau\"; noder nad yw'r  "
 "dewisiad yma ar gael ar bob arddull eto!"
 
-#: kwindecoration.cpp:163
+#: twindecoration.cpp:163
 msgid "&Window Decoration"
 msgstr "Addurniad &Ffenestr"
 
-#: kwindecoration.cpp:164
+#: twindecoration.cpp:164
 msgid "&Buttons"
 msgstr "&Botymau"
 
-#: 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 "Modwl Reoli Addurniadau Ffenestri"
 
-#: kwindecoration.cpp:185
+#: twindecoration.cpp:185
 msgid "(c) 2001 Karol Szwed"
 msgstr "(h)(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 "Pitw"
 
-#: kwindecoration.cpp:267
+#: twindecoration.cpp:267
 msgid "Normal"
 msgstr "Arferol"
 
-#: kwindecoration.cpp:268
+#: twindecoration.cpp:268
 msgid "Large"
 msgstr "Mawr"
 
-#: kwindecoration.cpp:269
+#: twindecoration.cpp:269
 #, fuzzy
 msgid "Very Large"
 msgstr "Maint ffin: Mawr Iawn"
 
-#: kwindecoration.cpp:270
+#: twindecoration.cpp:270
 msgid "Huge"
 msgstr "Anferth"
 
-#: kwindecoration.cpp:271
+#: twindecoration.cpp:271
 msgid "Very Huge"
 msgstr ""
 
-#: kwindecoration.cpp:272
+#: twindecoration.cpp:272
 #, fuzzy
 msgid "Oversized"
 msgstr "Newid maint"
 
-#: kwindecoration.cpp:591
+#: twindecoration.cpp:591
 #, fuzzy
 msgid ""
 "<h1>Window Manager Decoration</h1>"
diff --git a/tde-i18n-cy/messages/kdebase/kcmkwinrules.po b/tde-i18n-cy/messages/kdebase/kcmkwinrules.po
index 29a11b3e4f1..697fad00525 100644
--- a/tde-i18n-cy/messages/kdebase/kcmkwinrules.po
+++ b/tde-i18n-cy/messages/kdebase/kcmkwinrules.po
@@ -1,10 +1,10 @@
-# translation of kcmkwinrules.po to Cymraeg
+# translation of kcmtwinrules.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 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: 2004-07-03 17:42+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -91,8 +91,8 @@ msgid "Unknown - will be treated as Normal Window"
 msgstr "Anhysbys - trinir fel Ffenestr Arferol"
 
 #: 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-cy/messages/kdebase/kcmkwm.po b/tde-i18n-cy/messages/kdebase/kcmkwm.po
index a74a5a412a2..cb1378098c1 100644
--- a/tde-i18n-cy/messages/kdebase/kcmkwm.po
+++ b/tde-i18n-cy/messages/kdebase/kcmkwm.po
@@ -61,8 +61,8 @@ msgid "&Translucency"
 msgstr ""
 
 #: main.cpp:126
-msgid "kcmkwinoptions"
-msgstr "kcmkwinoptions"
+msgid "kcmtwinoptions"
+msgstr "kcmtwinoptions"
 
 #: main.cpp:126
 msgid "Window Behavior Configuration Module"
@@ -1015,7 +1015,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>"
diff --git a/tde-i18n-cy/messages/kdebase/kcmsmartcard.po b/tde-i18n-cy/messages/kdebase/kcmsmartcard.po
index b5f091bc757..de6df3fa293 100644
--- a/tde-i18n-cy/messages/kdebase/kcmsmartcard.po
+++ b/tde-i18n-cy/messages/kdebase/kcmsmartcard.po
@@ -45,19 +45,19 @@ msgstr "Rhesymau Posib"
 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) Nid yw'r ellyll KDE, 'kded' yn rhedeg. Gallwch ei ail-gychwyn drwy redeg y "
-"gorchymyn 'kdeinit' ac wedyn ceisio ail-lwytho'r Ganolfan Reoli KDE i weld os "
+"gorchymyn 'tdeinit' ac wedyn ceisio ail-lwytho'r Ganolfan Reoli KDE i weld os "
 "â'r neges hon i ffwrdd.\n"
 "\n"
 "2) Ymddengys nad oes gennych gynhaliaeth cardiau deallus yn y rhaglengelloedd "
-"KDE. Bydd rhaid i chi ail-grynhoi'r pecyn kdelibs â libpcsclite wedi'i osod."
+"KDE. Bydd rhaid i chi ail-grynhoi'r pecyn tdelibs â libpcsclite wedi'i osod."
 
 #. i18n: file smartcardbase.ui line 31
 #: rc.cpp:15
diff --git a/tde-i18n-cy/messages/kdebase/kdeprint_part.po b/tde-i18n-cy/messages/kdebase/kdeprint_part.po
index e35bb0a7a75..0b8d0c795c8 100644
--- a/tde-i18n-cy/messages/kdebase/kdeprint_part.po
+++ b/tde-i18n-cy/messages/kdebase/kdeprint_part.po
@@ -1,10 +1,10 @@
-# Translation of kdeprint_part.po to Cymraeg
+# Translation of tdeprint_part.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprint_part\n"
+"Project-Id-Version: tdeprint_part\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2003-07-17 10:25+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -27,14 +27,14 @@ msgid ""
 msgstr "kyfieithu@dotmon.com"
 
 #: 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 "Ategyn Konqueror am Reolaeth Argraffu"
 
-#. 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-cy/messages/kdebase/kdeprintfax.po b/tde-i18n-cy/messages/kdebase/kdeprintfax.po
index c5acdf508ea..bdfb78960b7 100644
--- a/tde-i18n-cy/messages/kdebase/kdeprintfax.po
+++ b/tde-i18n-cy/messages/kdebase/kdeprintfax.po
@@ -1,4 +1,4 @@
-# translation of kdeprintfax.po to Cymraeg
+# translation of tdeprintfax.po to Cymraeg
 # Bwrdd Gwaith yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,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: 2004-07-05 20:14+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -145,8 +145,8 @@ msgid ""
 msgstr "kyfieithu@dotmon.com"
 
 #: main.cpp:33
-msgid "A small fax utility to be used with kdeprint."
-msgstr "Cyfleuster ffacs bach i'w ddefnyddio â kdeprint."
+msgid "A small fax utility to be used with tdeprint."
+msgstr "Cyfleuster ffacs bach i'w ddefnyddio â tdeprint."
 
 #: main.cpp:39
 msgid "Phone number to fax to"
@@ -180,7 +180,7 @@ msgstr "Math MIME:"
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#. i18n: file kdeprintfaxui.rc line 10
+#. i18n: file tdeprintfaxui.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Fa&x"
@@ -250,11 +250,11 @@ msgstr "Hidlenni"
 msgid "Filters Configuration"
 msgstr "Ffurfwedd Hidlenni"
 
-#: faxab.cpp:41 kdeprintfax.cpp:88
+#: faxab.cpp:41 tdeprintfax.cpp:88
 msgid "Name"
 msgstr "Enw"
 
-#: faxab.cpp:42 kdeprintfax.cpp:87 kdeprintfax.cpp:562
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
 msgid "Fax Number"
 msgstr "Rhif Ffacs"
 
@@ -270,144 +270,144 @@ msgstr "&Golygu Llyfr Cyfeiriadau"
 msgid "No fax number found in your address book."
 msgstr "Ni ganfuwyd rhif ffacs yn eich llyfr cyfeiriadau."
 
-#: kdeprintfax.cpp:74
+#: tdeprintfax.cpp:74
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: kdeprintfax.cpp:79
+#: tdeprintfax.cpp:79
 msgid "Move down"
 msgstr "Symud i lawr"
 
-#: kdeprintfax.cpp:82
+#: tdeprintfax.cpp:82
 msgid "F&iles:"
 msgstr "Ffe&iliau:"
 
-#: kdeprintfax.cpp:89
+#: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "Menter"
 
-#: kdeprintfax.cpp:96
+#: tdeprintfax.cpp:96
 msgid "Add fax number"
 msgstr "Ychwanegu rhif ffacs"
 
-#: kdeprintfax.cpp:100
+#: tdeprintfax.cpp:100
 msgid "Add fax number from addressbook"
 msgstr "Ychwanegu rhif ffacs o'r llyfr cyfeiriadau"
 
-#: kdeprintfax.cpp:104
+#: tdeprintfax.cpp:104
 msgid "Remove fax number"
 msgstr "Gwaredu rhif ffacs"
 
-#: kdeprintfax.cpp:107
+#: tdeprintfax.cpp:107
 msgid "&Comment:"
 msgstr "&Sylw:"
 
-#: kdeprintfax.cpp:118
+#: tdeprintfax.cpp:118
 msgid "Sched&ule:"
 msgstr "Trefn&len:"
 
-#: kdeprintfax.cpp:120
+#: tdeprintfax.cpp:120
 msgid "Now"
 msgstr "Nawr"
 
-#: kdeprintfax.cpp:121
+#: tdeprintfax.cpp:121
 msgid "At Specified Time"
 msgstr "Am Amser Penodol"
 
-#: kdeprintfax.cpp:128
+#: tdeprintfax.cpp:128
 msgid "Send Co&ver Sheet"
 msgstr ""
 
-#: kdeprintfax.cpp:131
+#: tdeprintfax.cpp:131
 msgid "Su&bject:"
 msgstr "&Pwnc:"
 
-#: kdeprintfax.cpp:172 kdeprintfax.cpp:252
+#: tdeprintfax.cpp:172 tdeprintfax.cpp:252
 msgid "Processing..."
 msgstr "Yn prosesu..."
 
-#: kdeprintfax.cpp:173 kdeprintfax.cpp:402
+#: tdeprintfax.cpp:173 tdeprintfax.cpp:402
 msgid "Idle"
 msgstr "Segur"
 
-#: kdeprintfax.cpp:177
+#: tdeprintfax.cpp:177
 msgid "Send to Fax"
 msgstr "Anfon i'r Ffacs"
 
-#: kdeprintfax.cpp:191
+#: tdeprintfax.cpp:191
 msgid "&Add File..."
 msgstr "&Ychwanegu Ffeil..."
 
-#: kdeprintfax.cpp:192
+#: tdeprintfax.cpp:192
 msgid "&Remove File"
 msgstr "&Gwaredu Ffeil"
 
-#: kdeprintfax.cpp:193
+#: tdeprintfax.cpp:193
 msgid "&Send Fax"
 msgstr "&Anfon Ffacs"
 
-#: kdeprintfax.cpp:194
+#: tdeprintfax.cpp:194
 msgid "A&bort"
 msgstr "&Erthylu"
 
-#: kdeprintfax.cpp:195
+#: tdeprintfax.cpp:195
 msgid "A&ddress Book"
 msgstr "Llyfr Cyfeiria&dau"
 
-#: kdeprintfax.cpp:196
+#: tdeprintfax.cpp:196
 msgid "V&iew Log"
 msgstr "Gwe&ld y Cofnodion"
 
-#: kdeprintfax.cpp:197
+#: tdeprintfax.cpp:197
 msgid "Vi&ew File"
 msgstr "Gw&eld y Ffeil"
 
-#: kdeprintfax.cpp:198
+#: tdeprintfax.cpp:198
 msgid "&New Fax Recipient..."
 msgstr "&Derbyniwr Ffacs Newydd..."
 
-#: kdeprintfax.cpp:245
+#: tdeprintfax.cpp:245
 msgid "No file to fax."
 msgstr "Dim ffeil i'w hanfon fel ffacs."
 
-#: kdeprintfax.cpp:247
+#: tdeprintfax.cpp:247
 msgid "No fax number specified."
 msgstr "Ni benodwyd rhif ffacs."
 
-#: kdeprintfax.cpp:255
+#: tdeprintfax.cpp:255
 msgid "Unable to start Fax process."
 msgstr "Methu dechrau'r broses Ffacs."
 
-#: kdeprintfax.cpp:261
+#: tdeprintfax.cpp:261
 msgid "Unable to stop Fax process."
 msgstr "Methu atal y broses Ffacs."
 
-#: kdeprintfax.cpp:284
+#: tdeprintfax.cpp:284
 #, c-format
 msgid "Unable to retrieve %1."
 msgstr "Methu nôl %1."
 
-#: kdeprintfax.cpp:409
+#: tdeprintfax.cpp:409
 msgid "Fax error: see log message for more information."
 msgstr "Gwall ffacs: gweler y neges gofnod am fwy o wybodaeth."
 
-#: kdeprintfax.cpp:564
+#: tdeprintfax.cpp:564
 msgid "Enter recipient fax properties."
 msgstr "Rhowch briodweddau ffacs y derbyniwr."
 
-#: kdeprintfax.cpp:565
+#: tdeprintfax.cpp:565
 msgid "&Number:"
 msgstr "Rh&if:"
 
-#: kdeprintfax.cpp:566
+#: tdeprintfax.cpp:566
 msgid "N&ame:"
 msgstr "E&nw:"
 
-#: kdeprintfax.cpp:567
+#: tdeprintfax.cpp:567
 msgid "&Enterprise:"
 msgstr "&Menter:"
 
-#: kdeprintfax.cpp:593
+#: tdeprintfax.cpp:593
 msgid "Invalid fax number."
 msgstr "Rhif ffacs annilys."
 
diff --git a/tde-i18n-cy/messages/kdebase/kdesu.po b/tde-i18n-cy/messages/kdebase/kdesu.po
index daf1f28a14c..5c4e7343a2c 100644
--- a/tde-i18n-cy/messages/kdebase/kdesu.po
+++ b/tde-i18n-cy/messages/kdebase/kdesu.po
@@ -1,10 +1,10 @@
-# translation of kdesu.po to Cymraeg
+# translation of tdesu.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 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: 2003-07-22 13:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,110 +14,110 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kdesu.cpp:56 kdesu.cpp:57
+#: tdesu.cpp:56 tdesu.cpp:57
 #, fuzzy
 msgid "Specifies the command to run"
 msgstr "Penoda'r gorchymyn i'w redeg."
 
-#: kdesu.cpp:58
+#: tdesu.cpp:58
 #, fuzzy
 msgid "Run command under target uid if <file> is not writable"
 msgstr ""
 "Rhedeg yr orychymyn dan uid (dynodiad defnyddiwr) y cyrchfan os nad yw <ffeil> "
 "yn ysgrifenadwy."
 
-#: kdesu.cpp:59
+#: tdesu.cpp:59
 #, fuzzy
 msgid "Specifies the target uid"
 msgstr "Penoda uid y cyrchfan."
 
-#: kdesu.cpp:60
+#: tdesu.cpp:60
 #, fuzzy
 msgid "Do not keep password"
 msgstr "Peidio â chadw'r cyfrinair."
 
-#: kdesu.cpp:61
+#: tdesu.cpp:61
 #, fuzzy
 msgid "Stop the daemon (forgets all passwords)"
 msgstr "Atal yr ellyll (angofia bob cyfrinair)."
 
-#: kdesu.cpp:62
+#: tdesu.cpp:62
 #, fuzzy
 msgid "Enable terminal output (no password keeping)"
 msgstr "Galluogi allbwn terfynnell (dim cadw cyfrineiriau)."
 
-#: kdesu.cpp:63
+#: tdesu.cpp:63
 #, fuzzy
 msgid "Set priority value: 0 <= prio <= 100, 0 is lowest"
 msgstr "Gosodwch werth flaenoriaeth: 0 <= blaen'th <= 100, 0 sydd isaf."
 
-#: kdesu.cpp:64
+#: tdesu.cpp:64
 #, fuzzy
 msgid "Use realtime scheduling"
 msgstr "Defnyddio trefnlennu gwir-amser."
 
-#: kdesu.cpp:65
+#: tdesu.cpp:65
 #, fuzzy
 msgid "Let command use existing dcopserver"
 msgstr "Caniatáu i'r gorchymyn ddefnyddio dcopserver cyfredol."
 
-#: 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 "su KDE"
 
-#: kdesu.cpp:100
+#: tdesu.cpp:100
 msgid "Runs a program with elevated privileges."
 msgstr "Rheda raglen â breintiau dyrchafedig."
 
-#: kdesu.cpp:103
+#: tdesu.cpp:103
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: kdesu.cpp:105
+#: tdesu.cpp:105
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: kdesu.cpp:131
+#: tdesu.cpp:131
 msgid "Command '%1' not found."
 msgstr "Gorchymyn '%1' heb ei ganfod."
 
-#: kdesu.cpp:207
+#: tdesu.cpp:207
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "Blaenoriaeth anghyfreithlon: %1"
 
-#: kdesu.cpp:235
+#: tdesu.cpp:235
 msgid "No command specified."
 msgstr "Dim gorchymyn wedi'i benodi."
 
-#: kdesu.cpp:344
+#: tdesu.cpp:344
 #, fuzzy
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "Dychwelodd su â gwall!\n"
 
-#: kdesu.cpp:365
+#: tdesu.cpp:365
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#: kdesu.cpp:370
+#: tdesu.cpp:370
 msgid "realtime: "
 msgstr "gwir-amser: "
 
-#: kdesu.cpp:373
+#: tdesu.cpp:373
 msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
diff --git a/tde-i18n-cy/messages/kdebase/kdesud.po b/tde-i18n-cy/messages/kdebase/kdesud.po
index e978b497c87..4f7c0510113 100644
--- a/tde-i18n-cy/messages/kdebase/kdesud.po
+++ b/tde-i18n-cy/messages/kdebase/kdesud.po
@@ -1,10 +1,10 @@
-# Translation of kdesud.po to Cymraeg
+# Translation of tdesud.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdesud\n"
+"Project-Id-Version: tdesud\n"
 "POT-Creation-Date: 2005-07-23 01:32+0200\n"
 "PO-Revision-Date: 2003-07-17 16:22+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,15 +14,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kdesud.cpp:251
+#: tdesud.cpp:251
 msgid "KDE su daemon"
 msgstr "Ellyll su KDE"
 
-#: kdesud.cpp:252
-msgid "Daemon used by kdesu"
-msgstr "Ellyll (daemon) a ddefnyddir gan kdesu"
+#: tdesud.cpp:252
+msgid "Daemon used by tdesu"
+msgstr "Ellyll (daemon) a ddefnyddir gan tdesu"
 
-#: kdesud.cpp:255
+#: tdesud.cpp:255
 msgid "Author"
 msgstr "Awdur"
 
diff --git a/tde-i18n-cy/messages/kdebase/kio_trash.po b/tde-i18n-cy/messages/kdebase/kio_trash.po
index 075151a2c39..83298ee250a 100644
--- a/tde-i18n-cy/messages/kdebase/kio_trash.po
+++ b/tde-i18n-cy/messages/kdebase/kio_trash.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdebase/kio_trash.po\n"
+"Project-Id-Version: ../cy/messages//tdebase/kio_trash.po\n"
 "POT-Creation-Date: 2006-11-07 02:35+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdebase/knetattach.po b/tde-i18n-cy/messages/kdebase/knetattach.po
index 44eee21ae0f..a68d25ce0bd 100644
--- a/tde-i18n-cy/messages/kdebase/knetattach.po
+++ b/tde-i18n-cy/messages/kdebase/knetattach.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdebase/knetattach.po\n"
+"Project-Id-Version: ../cy/messages//tdebase/knetattach.po\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdebase/ksmserver.po b/tde-i18n-cy/messages/kdebase/ksmserver.po
index 0e592e81fa6..786a85d3a3f 100644
--- a/tde-i18n-cy/messages/kdebase/ksmserver.po
+++ b/tde-i18n-cy/messages/kdebase/ksmserver.po
@@ -42,10 +42,10 @@ msgstr "Adfera'r sesiwn defnyddiwr wedi'i gadw os ar gael"
 #: 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 ""
 "Dechreua 'wm' rhag ofn na bod trefnydd ffenestri arall \n"
-"yn cymeryd rhan yn y sesiwn. 'kwin' yw'r rhagosodyn."
+"yn cymeryd rhan yn y sesiwn. 'twin' yw'r rhagosodyn."
 
 #: main.cpp:38
 #, fuzzy
diff --git a/tde-i18n-cy/messages/kdebase/ktip.po b/tde-i18n-cy/messages/kdebase/ktip.po
index 89898a56a91..07197e4ec03 100644
--- a/tde-i18n-cy/messages/kdebase/ktip.po
+++ b/tde-i18n-cy/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"
@@ -67,7 +67,7 @@ msgstr ""
 " gwefannau gwerth eu gweld hefyd am gynhwysiadau bennaf tebyg i\n"
 " <A HREF=\"http://www.konqueror.org/\">Konqueror</A>, \n"
 " <A HREF=\"http://www.koffice.org/\">KSwyddfa</A> ac\n"
-" <A HREF=\"http://www.kdevelop.org/\">KDatblgyu</A>, neu defnyddioldebau pwysig "
+" <A HREF=\"http://www.tdevelop.org/\">KDatblgyu</A>, neu defnyddioldebau pwysig "
 "KDE fel\n"
 " <A HREF=\"http://printing.kde.org/\">KDEArgraffu</A>,\n"
 " a ellir ei ddefnyddio hyd yn oed tu allan o KDE...\n"
@@ -618,7 +618,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"
@@ -628,7 +628,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"
@@ -638,7 +638,7 @@ msgstr ""
 "<p>\n"
 " Angen gwybodaeth lawn am ArgraffuKDE? "
 "<br></p>\n"
-"<p> Teipiwch <strong>help:/kdeprint/</strong> i mewn i faes cyfeiriad "
+"<p> Teipiwch <strong>help:/tdeprint/</strong> i mewn i faes cyfeiriad "
 "Konqueror\n"
 " a chael y\n"
 "<a href=\"http://printing.kde.org/documentation/handbook/\">"
@@ -650,7 +650,7 @@ msgstr ""
 ", \n"
 " adran \"Cynghorion a Chastiau\" a\n"
 " <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"rhesr ebostio kdeprint</a>) \n"
+"rhesr ebostio tdeprint</a>) \n"
 " ar gael o\n"
 " <a href=\"http://printing.kde.org/\">printing.kde.org</a>... \n"
 " </p>\n"
@@ -913,7 +913,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"
@@ -927,7 +927,7 @@ msgstr ""
 " Yn gweithio efo Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
 " StarOffice, OpenOffice, unrhyw raglen GNOME a llawer mwy...</p>\n"
 " "
-"<p>Gweler <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>Gweler <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a> \n"
 " am gynghorion mwy manwl...\n"
 " </p>\n"
@@ -1067,7 +1067,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"
@@ -1085,7 +1085,7 @@ msgstr ""
 " "
 "<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"
 " Bydd hyn yn argraffu 3 ffeil gwahanol (o blygyll gwahanol) i argraffydd "
 "\"infotec\".\n"
diff --git a/tde-i18n-cy/messages/kdebase/kwin.po b/tde-i18n-cy/messages/kdebase/kwin.po
index af24d3d554c..67458e17df9 100644
--- a/tde-i18n-cy/messages/kdebase/kwin.po
+++ b/tde-i18n-cy/messages/kdebase/kwin.po
@@ -1,5 +1,5 @@
-# translation of kwin.po to Cymraeg
-# Translation of kwin.po to Cymraeg
+# translation of twin.po to Cymraeg
+# Translation of twin.po to Cymraeg
 # Bwrdd Gwaith yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -9,7 +9,7 @@
 #
 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: 2003-12-27 10:16+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -36,417 +36,417 @@ msgstr "kyfieithu@dotmon.com"
 msgid "Window '%1' demands attention."
 msgstr "Gweithredu'r Ffenestr sy'n Gofyn am Sylw"
 
-#: kwinbindings.cpp:18
+#: twinbindings.cpp:18
 msgid "System"
 msgstr "Cysawd"
 
-#: kwinbindings.cpp:20
+#: twinbindings.cpp:20
 msgid "Navigation"
 msgstr "Llywio"
 
-#: kwinbindings.cpp:21
+#: twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "Cerdded Trwy'r Ffenestri"
 
-#: kwinbindings.cpp:22
+#: twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "Cerdded Trwy'r Ffenestri (Am yn Ôl)"
 
-#: kwinbindings.cpp:23
+#: twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "Cerdded Trwy'r Penbyrddau"
 
-#: kwinbindings.cpp:24
+#: twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Cerdded Trwy'r Penbyrddau (Am yn Ôl)"
 
-#: kwinbindings.cpp:25
+#: twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "Cerdded Trwy'r Restr Penbyrddau"
 
-#: kwinbindings.cpp:26
+#: twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Cerdded Trwy'r Restr Penbyrddau (Am yn Ôl)"
 
-#: kwinbindings.cpp:28
+#: twinbindings.cpp:28
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: kwinbindings.cpp:29
+#: twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "Dewislen Weithredoedd Ffenestr"
 
-#: kwinbindings.cpp:30
+#: twinbindings.cpp:30
 msgid "Close Window"
 msgstr "Cau'r Ffenestr"
 
-#: kwinbindings.cpp:32
+#: twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "&Ehangu'r Ffenestr"
 
-#: kwinbindings.cpp:34
+#: twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "Ehangu'r Ffenestr yn Fertigol"
 
-#: kwinbindings.cpp:36
+#: twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "Ehangu'r Ffenestr yn Llorweddol"
 
-#: kwinbindings.cpp:38
+#: twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenestr"
 
-#: kwinbindings.cpp:40
+#: twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "Rholio'r Ffenestr"
 
-#: kwinbindings.cpp:42
+#: twinbindings.cpp:42
 msgid "Move Window"
 msgstr "Symud y Ffenestr"
 
-#: kwinbindings.cpp:44
+#: twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "Newid Maint y Ffenestr"
 
-#: kwinbindings.cpp:46
+#: twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "Codi'r Ffenestr"
 
-#: kwinbindings.cpp:48
+#: twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "Gostwng y Ffenestr"
 
-#: kwinbindings.cpp:50
+#: twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "Codi/Gostwng Ffenestr"
 
-#: kwinbindings.cpp:51
+#: twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "Gwneud i'r Ffenestr Lenwi'r Sgrîn"
 
-#: kwinbindings.cpp:53
+#: twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "Cuddio Ymyl y Ffenestr"
 
-#: kwinbindings.cpp:55
+#: twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "Cadw'r Ffenestr Uwchben y Lleill"
 
-#: kwinbindings.cpp:57
+#: twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "Cadw'r Ffenestr Dan y Lleill"
 
-#: kwinbindings.cpp:59
+#: twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "Gweithredu'r Ffenestr sy'n Gofyn am Sylw"
 
-#: kwinbindings.cpp:60
+#: twinbindings.cpp:60
 #, fuzzy
 msgid "Setup Window Shortcut"
 msgstr "Cadw Gosodiadau Ffenest&r"
 
-#: kwinbindings.cpp:61
+#: twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "Pacio'r Ffenestr i'r Dde"
 
-#: kwinbindings.cpp:63
+#: twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "Pacio'r Ffenestr i'r Chwith"
 
-#: kwinbindings.cpp:65
+#: twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "Pacio'r Ffenestr i Fyny"
 
-#: kwinbindings.cpp:67
+#: twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "Pacio'r Ffenestr i Lawr"
 
-#: kwinbindings.cpp:69
+#: twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Llorweddol"
 
-#: kwinbindings.cpp:71
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Fertigol"
 
-#: kwinbindings.cpp:73
+#: twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Llorweddol"
 
-#: kwinbindings.cpp:75
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Fertigol"
 
-#: kwinbindings.cpp:78
+#: twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "Ffenestr & Penbwrdd"
 
-#: kwinbindings.cpp:79
+#: twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "Cadw'r Ffenestr ar Bob un Penbwrdd"
 
-#: kwinbindings.cpp:81
+#: twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "Ffenestr i Benbwrdd 1"
 
-#: kwinbindings.cpp:82
+#: twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: kwinbindings.cpp:83
+#: twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "Ffenestr i Benbwrdd 3"
 
-#: kwinbindings.cpp:84
+#: twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "Ffenestr i Benbwrdd 4"
 
-#: kwinbindings.cpp:85
+#: twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "Ffenestr i Benbwrdd 5"
 
-#: kwinbindings.cpp:86
+#: twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "Ffenestr i Benbwrdd 6"
 
-#: kwinbindings.cpp:87
+#: twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: kwinbindings.cpp:88
+#: twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: kwinbindings.cpp:89
+#: twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: kwinbindings.cpp:90
+#: twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "Ffenestr i Benbwrdd 10"
 
-#: kwinbindings.cpp:91
+#: twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "Ffenestr i Benbwrdd 11"
 
-#: kwinbindings.cpp:92
+#: twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "Ffenestr i Benbwrdd 12"
 
-#: kwinbindings.cpp:93
+#: twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "Ffenestr i Benbwrdd 13"
 
-#: kwinbindings.cpp:94
+#: twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "Ffenestr i Benbwrdd 14"
 
-#: kwinbindings.cpp:95
+#: twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "Ffenestr i Benbwrdd 15"
 
-#: kwinbindings.cpp:96
+#: twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "Ffenestr i Benbwrdd 16"
 
-#: kwinbindings.cpp:97
+#: twinbindings.cpp:97
 #, fuzzy
 msgid "Window to Desktop 17"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: kwinbindings.cpp:98
+#: twinbindings.cpp:98
 #, fuzzy
 msgid "Window to Desktop 18"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: kwinbindings.cpp:99
+#: twinbindings.cpp:99
 #, fuzzy
 msgid "Window to Desktop 19"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: kwinbindings.cpp:100
+#: twinbindings.cpp:100
 #, fuzzy
 msgid "Window to Desktop 20"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: kwinbindings.cpp:101
+#: twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "Ffenestr i'r Penbwrdd Nesaf"
 
-#: kwinbindings.cpp:102
+#: twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "Ffenestr i'r Penbwrdd Blaenorol"
 
-#: kwinbindings.cpp:103
+#: twinbindings.cpp:103
 #, fuzzy
 msgid "Window One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: kwinbindings.cpp:104
+#: twinbindings.cpp:104
 #, fuzzy
 msgid "Window One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: kwinbindings.cpp:105
+#: twinbindings.cpp:105
 #, fuzzy
 msgid "Window One Desktop Up"
 msgstr "Ffenestr & Penbwrdd"
 
-#: kwinbindings.cpp:106
+#: twinbindings.cpp:106
 #, fuzzy
 msgid "Window One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: kwinbindings.cpp:108
+#: twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "Newid Penbwrdd"
 
-#: kwinbindings.cpp:109
+#: twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "Newid i Benbwrdd 1"
 
-#: kwinbindings.cpp:110
+#: twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "Newid i Benbwrdd 2"
 
-#: kwinbindings.cpp:111
+#: twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "Newid i Benbwrdd 3"
 
-#: kwinbindings.cpp:112
+#: twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "Newid i Benbwrdd 4"
 
-#: kwinbindings.cpp:113
+#: twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "Newid i Benbwrdd 5"
 
-#: kwinbindings.cpp:114
+#: twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "Newid i Benbwrdd 6"
 
-#: kwinbindings.cpp:115
+#: twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "Newid i Benbwrdd 7"
 
-#: kwinbindings.cpp:116
+#: twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "Newid i Benbwrdd 8"
 
-#: kwinbindings.cpp:117
+#: twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "Newid i Benbwrdd 9"
 
-#: kwinbindings.cpp:118
+#: twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "Newid i Benbwrdd 10"
 
-#: kwinbindings.cpp:119
+#: twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "Newid i Benbwrdd 11"
 
-#: kwinbindings.cpp:120
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "Newid i Benbwrdd 12"
 
-#: kwinbindings.cpp:121
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "Newid i Benbwrdd 13"
 
-#: kwinbindings.cpp:122
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "Newid i Benbwrdd 14"
 
-#: kwinbindings.cpp:123
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "Newid i Benbwrdd 15"
 
-#: kwinbindings.cpp:124
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "Newid i Benbwrdd 16"
 
-#: kwinbindings.cpp:125
+#: twinbindings.cpp:125
 #, fuzzy
 msgid "Switch to Desktop 17"
 msgstr "Newid i Benbwrdd 7"
 
-#: kwinbindings.cpp:126
+#: twinbindings.cpp:126
 #, fuzzy
 msgid "Switch to Desktop 18"
 msgstr "Newid i Benbwrdd 8"
 
-#: kwinbindings.cpp:127
+#: twinbindings.cpp:127
 #, fuzzy
 msgid "Switch to Desktop 19"
 msgstr "Newid i Benbwrdd 9"
 
-#: kwinbindings.cpp:128
+#: twinbindings.cpp:128
 #, fuzzy
 msgid "Switch to Desktop 20"
 msgstr "Newid i Benbwrdd 2"
 
-#: kwinbindings.cpp:129
+#: twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: kwinbindings.cpp:130
+#: twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "Newid i'r Penbwrdd Blaenorol"
 
-#: kwinbindings.cpp:131
+#: twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: kwinbindings.cpp:132
+#: twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: kwinbindings.cpp:133
+#: twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "Newid Un Penbwrdd i Fynnu"
 
-#: kwinbindings.cpp:134
+#: twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: kwinbindings.cpp:137
+#: twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "Efelychiad Llygoden"
 
-#: kwinbindings.cpp:138
+#: twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "Lladd Ffenestr"
 
-#: kwinbindings.cpp:139
+#: twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "Sgrînlun Ffenestr"
 
-#: kwinbindings.cpp:140
+#: twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "Sgrînlun Penbwrdd"
 
-#: 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: Eitha debyg mae trefnydd ffenestri yn rhedeg yn barod. Ni ddechreuwyd "
-"kwin.\n"
+"twin: Eitha debyg mae trefnydd ffenestri yn rhedeg yn barod. Ni ddechreuwyd "
+"twin.\n"
 
 #: main.cpp:80
-msgid "kwin: failure during initialization; aborting"
-msgstr "kwin: methiant yn ystod ymgychwyn, erthylir"
+msgid "twin: failure during initialization; aborting"
+msgstr "twin: methiant yn ystod ymgychwyn, erthylir"
 
 #: 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: Methu hawlio dewisiad trefnydd, trefnydd ffenestri arall yn rhedeg? "
+"twin: Methu hawlio dewisiad trefnydd, trefnydd ffenestri arall yn rhedeg? "
 "(Ceisiwch ddefnyddio --replace)\n"
 
 #: main.cpp:182
diff --git a/tde-i18n-cy/messages/kdebase/kwin_clients.po b/tde-i18n-cy/messages/kdebase/kwin_clients.po
index 4c29463acc9..152e4eabb5a 100644
--- a/tde-i18n-cy/messages/kdebase/kwin_clients.po
+++ b/tde-i18n-cy/messages/kdebase/kwin_clients.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdebase/kwin_clients.po\n"
+"Project-Id-Version: ../cy/messages//tdebase/twin_clients.po\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdebase/libkickermenu_kdeprint.po b/tde-i18n-cy/messages/kdebase/libkickermenu_kdeprint.po
index 59a8b215af4..28e368968bb 100644
--- a/tde-i18n-cy/messages/kdebase/libkickermenu_kdeprint.po
+++ b/tde-i18n-cy/messages/kdebase/libkickermenu_kdeprint.po
@@ -1,10 +1,10 @@
-# translation of libkickermenu_kdeprint.po to Cymraeg
+# translation of libkickermenu_tdeprint.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 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: 2003-07-22 17:03+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/Makefile.in b/tde-i18n-cy/messages/kdeedu/Makefile.in
index 426f993de4c..0e3cd404039 100644
--- a/tde-i18n-cy/messages/kdeedu/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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-cy/messages/kdeedu/kalzium.po b/tde-i18n-cy/messages/kdeedu/kalzium.po
index acbc870ac41..8f47fb9909d 100644
--- a/tde-i18n-cy/messages/kdeedu/kalzium.po
+++ b/tde-i18n-cy/messages/kdeedu/kalzium.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kalzium.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kalzium.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/keduca.po b/tde-i18n-cy/messages/kdeedu/keduca.po
index d711c0e0afd..fe52c38524d 100644
--- a/tde-i18n-cy/messages/kdeedu/keduca.po
+++ b/tde-i18n-cy/messages/kdeedu/keduca.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/keduca.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/keduca.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kfile_drgeo.po b/tde-i18n-cy/messages/kdeedu/kfile_drgeo.po
index 9d7cbd30953..c03dbaf739b 100644
--- a/tde-i18n-cy/messages/kdeedu/kfile_drgeo.po
+++ b/tde-i18n-cy/messages/kdeedu/kfile_drgeo.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kfile_drgeo.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kfile_drgeo.po\n"
 "POT-Creation-Date: 2005-05-08 12:46+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kfile_kig.po b/tde-i18n-cy/messages/kdeedu/kfile_kig.po
index c20aeb01d67..8f4d376ad2d 100644
--- a/tde-i18n-cy/messages/kdeedu/kfile_kig.po
+++ b/tde-i18n-cy/messages/kdeedu/kfile_kig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kfile_kig.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kfile_kig.po\n"
 "POT-Creation-Date: 2005-05-25 08:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/khangman.po b/tde-i18n-cy/messages/kdeedu/khangman.po
index 6d651c940a5..7da4143ebbf 100644
--- a/tde-i18n-cy/messages/kdeedu/khangman.po
+++ b/tde-i18n-cy/messages/kdeedu/khangman.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/khangman.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/khangman.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kig.po b/tde-i18n-cy/messages/kdeedu/kig.po
index 3391821411e..10c10b7be25 100644
--- a/tde-i18n-cy/messages/kdeedu/kig.po
+++ b/tde-i18n-cy/messages/kdeedu/kig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kig.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kig.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kiten.po b/tde-i18n-cy/messages/kdeedu/kiten.po
index 3415dca3907..c3bd9e2dc06 100644
--- a/tde-i18n-cy/messages/kdeedu/kiten.po
+++ b/tde-i18n-cy/messages/kdeedu/kiten.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kiten.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kiten.po\n"
 "POT-Creation-Date: 2005-04-20 15:09+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/klatin.po b/tde-i18n-cy/messages/kdeedu/klatin.po
index abf7e1e23ce..c8e3070299e 100644
--- a/tde-i18n-cy/messages/kdeedu/klatin.po
+++ b/tde-i18n-cy/messages/kdeedu/klatin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/klatin.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/klatin.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/klettres.po b/tde-i18n-cy/messages/kdeedu/klettres.po
index 24d1d2b072d..d15b6198e16 100644
--- a/tde-i18n-cy/messages/kdeedu/klettres.po
+++ b/tde-i18n-cy/messages/kdeedu/klettres.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/klettres.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/klettres.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kmplot.po b/tde-i18n-cy/messages/kdeedu/kmplot.po
index b03a25dceb9..6bbc14b79a9 100644
--- a/tde-i18n-cy/messages/kdeedu/kmplot.po
+++ b/tde-i18n-cy/messages/kdeedu/kmplot.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kmplot.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kmplot.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/ktouch.po b/tde-i18n-cy/messages/kdeedu/ktouch.po
index 1b1705f744c..1ffeb9e0468 100644
--- a/tde-i18n-cy/messages/kdeedu/ktouch.po
+++ b/tde-i18n-cy/messages/kdeedu/ktouch.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/ktouch.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/ktouch.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kturtle.po b/tde-i18n-cy/messages/kdeedu/kturtle.po
index 56d0186d697..d2bb3275f48 100644
--- a/tde-i18n-cy/messages/kdeedu/kturtle.po
+++ b/tde-i18n-cy/messages/kdeedu/kturtle.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kturtle.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kturtle.po\n"
 "POT-Creation-Date: 2007-06-18 01:16+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kverbos.po b/tde-i18n-cy/messages/kdeedu/kverbos.po
index 51b312172e5..c5e82afc83f 100644
--- a/tde-i18n-cy/messages/kdeedu/kverbos.po
+++ b/tde-i18n-cy/messages/kdeedu/kverbos.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kverbos.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kverbos.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/kvoctrain.po b/tde-i18n-cy/messages/kdeedu/kvoctrain.po
index 7edfc9a4b21..c371679a5fa 100644
--- a/tde-i18n-cy/messages/kdeedu/kvoctrain.po
+++ b/tde-i18n-cy/messages/kdeedu/kvoctrain.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeedu/kvoctrain.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/kvoctrain.po\n"
 "POT-Creation-Date: 2008-07-08 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeedu/libkdeedu.po b/tde-i18n-cy/messages/kdeedu/libkdeedu.po
index d636b0cd13d..d2c6843cc69 100644
--- a/tde-i18n-cy/messages/kdeedu/libkdeedu.po
+++ b/tde-i18n-cy/messages/kdeedu/libkdeedu.po
@@ -1,8 +1,8 @@
-# translation of libkdeedu.po to Cymraeg
+# translation of libtdeedu.po to Cymraeg
 # Kevin Donnelly <kevin@dotmon.com>, 2005.
 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: 2005-11-02 21:57+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
@@ -305,15 +305,15 @@ msgstr "Dewiswch flwyddyn"
 msgid "Select the current day"
 msgstr "Dewis y diwrnod cyfredol"
 
-#: kdeeduui/kdeeduglossary.cpp:35 kdeeduui/kdeeduglossary.cpp:166
+#: tdeeduui/tdeeduglossary.cpp:35 tdeeduui/tdeeduglossary.cpp:166
 msgid "Glossary"
 msgstr "Geirfa"
 
-#: kdeeduui/kdeeduglossary.cpp:185
+#: tdeeduui/tdeeduglossary.cpp:185
 msgid "Search:"
 msgstr "Chwilio:"
 
-#: kdeeduui/kdeeduglossary.cpp:390
+#: tdeeduui/tdeeduglossary.cpp:390
 msgid "References"
 msgstr "Cyfeiriadau"
 
diff --git a/tde-i18n-cy/messages/kdegames/Makefile.in b/tde-i18n-cy/messages/kdegames/Makefile.in
index 117c6fa0b76..54ec96f0770 100644
--- a/tde-i18n-cy/messages/kdegames/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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-cy/messages/kdegames/kwin4.po b/tde-i18n-cy/messages/kdegames/kwin4.po
index 64d9736b0f0..cae1cc9f017 100644
--- a/tde-i18n-cy/messages/kdegames/kwin4.po
+++ b/tde-i18n-cy/messages/kdegames/kwin4.po
@@ -1,4 +1,4 @@
-# translation of kwin4.po to Cymraeg
+# translation of twin4.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 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: 2005-10-15 17:37+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
@@ -30,177 +30,177 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kwin4.cpp:67
+#: twin4.cpp:67
 msgid "Chat Dlg"
 msgstr "Ymgom Sgwrsio"
 
-#: kwin4.cpp:73
+#: twin4.cpp:73
 msgid "Chat"
 msgstr "Sgwrsio"
 
-#: kwin4.cpp:79
+#: twin4.cpp:79
 msgid "Configure..."
 msgstr "Ffurfweddu..."
 
-#: kwin4.cpp:192
+#: twin4.cpp:192
 msgid "Start a new game"
 msgstr "Dechrau gêm newydd"
 
-#: kwin4.cpp:195
+#: twin4.cpp:195
 msgid "Open a saved game..."
 msgstr "Agor gêm wedi'i chadw..."
 
-#: kwin4.cpp:198
+#: twin4.cpp:198
 msgid "Save a game..."
 msgstr "Cadw gêm..."
 
-#: kwin4.cpp:201
+#: twin4.cpp:201
 msgid "Ending the current game..."
 msgstr "Terfynu'r gêm gyfredol..."
 
-#: kwin4.cpp:202
+#: twin4.cpp:202
 msgid "Aborts a currently played game. No winner will be declared."
 msgstr ""
 "Erthylu'r gêm sy'n cael ei chwarae ar hyn o bryd.  Ni fydd ennillwr yn cael ei "
 "gyhoeddi."
 
-#: kwin4.cpp:204
+#: twin4.cpp:204
 msgid "&Network Configuration..."
 msgstr "Ffurfweddu &Rhwydwaith..."
 
-#: kwin4.cpp:207
+#: twin4.cpp:207
 msgid "Network Chat..."
 msgstr "Sgwrsio Rhwydwaith..."
 
-#: kwin4.cpp:211
+#: twin4.cpp:211
 msgid "Debug KGame"
 msgstr "Dadnamu KGame"
 
-#: kwin4.cpp:214
+#: twin4.cpp:214
 msgid "&Show Statistics"
 msgstr "&Dangos Ystadegau"
 
-#: kwin4.cpp:216
+#: twin4.cpp:216
 msgid "Show statistics."
 msgstr "Dangos ystadegau."
 
-#: kwin4.cpp:219
+#: twin4.cpp:219
 msgid "Shows a hint on how to move."
 msgstr "Dangos cynghoryn am sut i symud."
 
-#: kwin4.cpp:222
+#: twin4.cpp:222
 msgid "Quits the program."
 msgstr "Terfynu'r rhaglen."
 
-#: kwin4.cpp:225
+#: twin4.cpp:225
 msgid "Undo last move."
 msgstr "Dadwneud symudiad diwethaf."
 
-#: kwin4.cpp:228
+#: twin4.cpp:228
 msgid "Redo last move."
 msgstr "Ailwneud symudiad diwethaf."
 
-#: kwin4.cpp:242 kwin4.cpp:252
+#: twin4.cpp:242 twin4.cpp:252
 msgid "Ready"
 msgstr "Parod"
 
-#: kwin4.cpp:251
+#: twin4.cpp:251
 msgid "This leaves space for the mover"
 msgstr "Mae hyn yn gadael lle i'r symudwr"
 
-#: kwin4.cpp:254
+#: twin4.cpp:254
 msgid "(c) Martin Heni   "
 msgstr "Hawlfraint (Copyright) Martin Heni"
 
-#: kwin4.cpp:255
+#: twin4.cpp:255
 msgid "Welcome to KWin4"
 msgstr "Croeso i KWin4"
 
-#: kwin4.cpp:457
+#: twin4.cpp:457
 msgid "No game  "
 msgstr "Dim gêm"
 
-#: kwin4.cpp:459
+#: twin4.cpp:459
 msgid " - Yellow "
 msgstr "- Melyn"
 
-#: kwin4.cpp:461
+#: twin4.cpp:461
 msgid " - Red "
 msgstr "- Coch"
 
-#: kwin4.cpp:463
+#: twin4.cpp:463
 msgid "Nobody  "
 msgstr "Neb"
 
-#: kwin4.cpp:482
+#: twin4.cpp:482
 msgid ""
 "The network game ended!\n"
 msgstr ""
 "Daeth y gêm rhwydwaith i ben!\n"
 
-#: kwin4.cpp:493
+#: twin4.cpp:493
 msgid "Game running..."
 msgstr "Gêm yn rhedeg..."
 
-#: kwin4.cpp:504
+#: twin4.cpp:504
 msgid "The game is drawn. Please restart next round."
 msgstr "Mae'r gêm yn gyfartal.  Ailgychwynnwch y rownd nesaf."
 
-#: kwin4.cpp:512
+#: twin4.cpp:512
 msgid "%1 won the game. Please restart next round."
 msgstr "Ennillodd %1 y gêm. Ailgychwynnwch y rownd nesaf. "
 
-#: kwin4.cpp:518
+#: twin4.cpp:518
 msgid " Game aborted. Please restart next round."
 msgstr "Erthylwyd y gêm.  Ailgychwynnwch y rownd nesaf."
 
-#: kwin4.cpp:536
+#: twin4.cpp:536
 msgid "Network Configuration"
 msgstr "Ffurfweddu Rhwydwaith"
 
-#: kwin4.cpp:548
+#: twin4.cpp:548
 msgid "Yellow should be played by remote"
 msgstr "Dylai Melyn gael ei chwarae gan yr un pell"
 
-#: kwin4.cpp:549
+#: twin4.cpp:549
 msgid "Red should be played by remote"
 msgstr "Dylai Coch gael ei chwarae gan yr un pell"
 
-#: kwin4.cpp:621
+#: twin4.cpp:621
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kwin4view.cpp:350
+#: twin4view.cpp:350
 msgid ""
 "_: 1. intro line, welcome to win4\n"
 "Welcome"
 msgstr "Croeso"
 
-#: kwin4view.cpp:356
+#: twin4view.cpp:356
 msgid ""
 "_: 2. intro line, welcome to win4\n"
 "to"
 msgstr "i"
 
-#: kwin4view.cpp:362
+#: twin4view.cpp:362
 msgid ""
 "_: 3. intro line, welcome to win4\n"
 "KWin4"
 msgstr "KWin4"
 
-#: kwin4view.cpp:606
+#: twin4view.cpp:606
 msgid "Hold on... the other player has not been yet..."
 msgstr "Arhoswch am eiliad... Nid yw'r chwaraewr arall yn barod eto..."
 
-#: kwin4view.cpp:607
+#: twin4view.cpp:607
 msgid "Hold your horses..."
 msgstr "Arhoswch am eiliad..."
 
-#: kwin4view.cpp:608
+#: twin4view.cpp:608
 msgid "Ah ah ah... only one go at a time..."
 msgstr "Twt twt twt... 'mond un ar y tro..."
 
-#: kwin4view.cpp:609
+#: twin4view.cpp:609
 msgid "Please wait... it is not your turn."
 msgstr "Arhoswch, newch chi... dim eich tro chi ydy o."
 
@@ -398,31 +398,31 @@ msgstr "L"
 msgid "Bk"
 msgstr "Bk"
 
-#. i18n: file kwin4.kcfg line 9
+#. i18n: file twin4.kcfg line 9
 #: rc.cpp:117
 #, no-c-format
 msgid "Network connection port"
 msgstr "Porth cysylltiad rhwydwaith"
 
-#. i18n: file kwin4.kcfg line 13
+#. i18n: file twin4.kcfg line 13
 #: rc.cpp:120
 #, no-c-format
 msgid "Game name"
 msgstr "Enw gêm"
 
-#. i18n: file kwin4.kcfg line 16
+#. i18n: file twin4.kcfg line 16
 #: rc.cpp:123
 #, no-c-format
 msgid "Network connection host"
 msgstr "Gweinydd cysylltiad rhwydwaith"
 
-#. i18n: file kwin4.kcfg line 27
+#. i18n: file twin4.kcfg line 27
 #: rc.cpp:129
 #, no-c-format
 msgid "Player 1 name"
 msgstr "Enw chwaraewr 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-cy/messages/kdegames/libkdegames.po b/tde-i18n-cy/messages/kdegames/libkdegames.po
index 1dd460552b4..e51cb7fbbc7 100644
--- a/tde-i18n-cy/messages/kdegames/libkdegames.po
+++ b/tde-i18n-cy/messages/kdegames/libkdegames.po
@@ -1,4 +1,4 @@
-# translation of libkdegames.po to Cymraeg
+# translation of libtdegames.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 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: 2005-10-15 22:24+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/Makefile.in b/tde-i18n-cy/messages/kdegraphics/Makefile.in
index baec506bb98..989a7b33228 100644
--- a/tde-i18n-cy/messages/kdegraphics/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdegraphics/kcm_kviewcanvasconfig.po b/tde-i18n-cy/messages/kdegraphics/kcm_kviewcanvasconfig.po
index fbe5084c2e8..d5437be3f65 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcm_kviewcanvasconfig.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcm_kviewcanvasconfig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kcm_kviewcanvasconfig.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewcanvasconfig.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kcm_kviewgeneralconfig.po b/tde-i18n-cy/messages/kdegraphics/kcm_kviewgeneralconfig.po
index a2a0ff9fad4..1b09b03da78 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcm_kviewgeneralconfig.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcm_kviewgeneralconfig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kcm_kviewgeneralconfig.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewgeneralconfig.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kcm_kviewpluginsconfig.po b/tde-i18n-cy/messages/kdegraphics/kcm_kviewpluginsconfig.po
index f7634657ef4..a52640da5ab 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcm_kviewpluginsconfig.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcm_kviewpluginsconfig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kcm_kviewpluginsconfig.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewpluginsconfig.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po b/tde-i18n-cy/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po
index 457580660ff..4217cf815b7 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: "
-"../cy/messages//kdegraphics/kcm_kviewviewerpluginsconfig.po\n"
+"../cy/messages//tdegraphics/kcm_kviewviewerpluginsconfig.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kcmkamera.po b/tde-i18n-cy/messages/kdegraphics/kcmkamera.po
index 498b1c93bad..c7489612d5d 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcmkamera.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcmkamera.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kcmkamera.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kcmkamera.po\n"
 "POT-Creation-Date: 2007-05-28 02:15+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kcoloredit.po b/tde-i18n-cy/messages/kdegraphics/kcoloredit.po
index b4c5456f988..c937edc1080 100644
--- a/tde-i18n-cy/messages/kdegraphics/kcoloredit.po
+++ b/tde-i18n-cy/messages/kdegraphics/kcoloredit.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kcoloredit.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kcoloredit.po\n"
 "POT-Creation-Date: 2006-06-05 03:59+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kdvi.po b/tde-i18n-cy/messages/kdegraphics/kdvi.po
index f36f66a897e..14c701f6d71 100644
--- a/tde-i18n-cy/messages/kdegraphics/kdvi.po
+++ b/tde-i18n-cy/messages/kdegraphics/kdvi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kdvi.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kdvi.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfax.po b/tde-i18n-cy/messages/kdegraphics/kfax.po
index 47ecca68834..64c93af4991 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfax.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfax.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfax.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfax.po\n"
 "POT-Creation-Date: 2006-11-13 02:37+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_bmp.po b/tde-i18n-cy/messages/kdegraphics/kfile_bmp.po
index c70f332a392..25a31aafbe3 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_bmp.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_bmp.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_bmp.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_bmp.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_dvi.po b/tde-i18n-cy/messages/kdegraphics/kfile_dvi.po
index 1182e18f416..ac1021e2674 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_dvi.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_dvi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_dvi.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_dvi.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_exr.po b/tde-i18n-cy/messages/kdegraphics/kfile_exr.po
index d163ede1f36..fe12953ea3c 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_exr.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_exr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_exr.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_exr.po\n"
 "POT-Creation-Date: 2007-08-23 01:13+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_gif.po b/tde-i18n-cy/messages/kdegraphics/kfile_gif.po
index 4bac3960fe8..9848e2485c4 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_gif.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_gif.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_gif.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_gif.po\n"
 "POT-Creation-Date: 2005-03-14 01:33+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_ico.po b/tde-i18n-cy/messages/kdegraphics/kfile_ico.po
index fe881fe5ba6..b240366f6e4 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_ico.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_ico.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_ico.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_ico.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_jpeg.po b/tde-i18n-cy/messages/kdegraphics/kfile_jpeg.po
index e0a71deb428..5944c0df08b 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_jpeg.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_jpeg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_jpeg.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_jpeg.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_pcx.po b/tde-i18n-cy/messages/kdegraphics/kfile_pcx.po
index 0ae837088c8..c20e7d77435 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_pcx.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_pcx.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_pcx.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pcx.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_pdf.po b/tde-i18n-cy/messages/kdegraphics/kfile_pdf.po
index 8f1e7be1ec3..dbe9466df99 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_pdf.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_pdf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_pdf.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pdf.po\n"
 "POT-Creation-Date: 2005-04-20 15:05+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_png.po b/tde-i18n-cy/messages/kdegraphics/kfile_png.po
index 23944c4b0da..66bdccf62a3 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_png.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_png.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_png.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_png.po\n"
 "POT-Creation-Date: 2004-12-16 01:20+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_pnm.po b/tde-i18n-cy/messages/kdegraphics/kfile_pnm.po
index a1696e60c03..56240d064a8 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_pnm.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_pnm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_pnm.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pnm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_ps.po b/tde-i18n-cy/messages/kdegraphics/kfile_ps.po
index 4ea95b78930..2aa5fefe535 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_ps.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_ps.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_ps.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_ps.po\n"
 "POT-Creation-Date: 2005-03-29 01:16+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_rgb.po b/tde-i18n-cy/messages/kdegraphics/kfile_rgb.po
index ec375544a86..a3d6251f61d 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_rgb.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_rgb.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_rgb.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_rgb.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_tga.po b/tde-i18n-cy/messages/kdegraphics/kfile_tga.po
index 51772e18a09..8bf7d3e44ff 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_tga.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_tga.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_tga.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_tga.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_tiff.po b/tde-i18n-cy/messages/kdegraphics/kfile_tiff.po
index faae119dcc2..9933446d5a0 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_tiff.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_tiff.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_tiff.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_tiff.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kfile_xbm.po b/tde-i18n-cy/messages/kdegraphics/kfile_xbm.po
index 18540d06855..8f85cc5fd16 100644
--- a/tde-i18n-cy/messages/kdegraphics/kfile_xbm.po
+++ b/tde-i18n-cy/messages/kdegraphics/kfile_xbm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kfile_xbm.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kfile_xbm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kgamma.po b/tde-i18n-cy/messages/kdegraphics/kgamma.po
index dd23805e614..7f7413959e4 100644
--- a/tde-i18n-cy/messages/kdegraphics/kgamma.po
+++ b/tde-i18n-cy/messages/kdegraphics/kgamma.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kgamma.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kgamma.po\n"
 "POT-Creation-Date: 2006-09-24 02:37+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kghostview.po b/tde-i18n-cy/messages/kdegraphics/kghostview.po
index 274bf76daf4..3743e7138f2 100644
--- a/tde-i18n-cy/messages/kdegraphics/kghostview.po
+++ b/tde-i18n-cy/messages/kdegraphics/kghostview.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kghostview.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kghostview.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kiconedit.po b/tde-i18n-cy/messages/kdegraphics/kiconedit.po
index fd3bcfe12b0..59a251d25c4 100644
--- a/tde-i18n-cy/messages/kdegraphics/kiconedit.po
+++ b/tde-i18n-cy/messages/kdegraphics/kiconedit.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kiconedit.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kiconedit.po\n"
 "POT-Creation-Date: 2006-03-05 03:45+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kmrml.po b/tde-i18n-cy/messages/kdegraphics/kmrml.po
index e564c829950..8061541cef6 100644
--- a/tde-i18n-cy/messages/kdegraphics/kmrml.po
+++ b/tde-i18n-cy/messages/kdegraphics/kmrml.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kmrml.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kmrml.po\n"
 "POT-Creation-Date: 2006-11-25 02:35+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kolourpaint.po b/tde-i18n-cy/messages/kdegraphics/kolourpaint.po
index 19ee35b8922..8a228c30b23 100644
--- a/tde-i18n-cy/messages/kdegraphics/kolourpaint.po
+++ b/tde-i18n-cy/messages/kdegraphics/kolourpaint.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kolourpaint.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kolourpaint.po\n"
 "POT-Creation-Date: 2007-10-23 01:13+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kooka.po b/tde-i18n-cy/messages/kdegraphics/kooka.po
index 3f60a96fd03..36658aa64c7 100644
--- a/tde-i18n-cy/messages/kdegraphics/kooka.po
+++ b/tde-i18n-cy/messages/kdegraphics/kooka.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kooka.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kooka.po\n"
 "POT-Creation-Date: 2006-04-23 03:56+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kpdf.po b/tde-i18n-cy/messages/kdegraphics/kpdf.po
index 3e88186e2e0..bac2cdc12c3 100644
--- a/tde-i18n-cy/messages/kdegraphics/kpdf.po
+++ b/tde-i18n-cy/messages/kdegraphics/kpdf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kpdf.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kpdf.po\n"
 "POT-Creation-Date: 2008-07-23 01:41+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kpovmodeler.po b/tde-i18n-cy/messages/kdegraphics/kpovmodeler.po
index f67866d5ba2..b8fd5032029 100644
--- a/tde-i18n-cy/messages/kdegraphics/kpovmodeler.po
+++ b/tde-i18n-cy/messages/kdegraphics/kpovmodeler.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kpovmodeler.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kpovmodeler.po\n"
 "POT-Creation-Date: 2006-05-28 03:57+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kruler.po b/tde-i18n-cy/messages/kdegraphics/kruler.po
index 8c9f60d93fb..a12f0ecb75a 100644
--- a/tde-i18n-cy/messages/kdegraphics/kruler.po
+++ b/tde-i18n-cy/messages/kdegraphics/kruler.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kruler.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kruler.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/ksnapshot.po b/tde-i18n-cy/messages/kdegraphics/ksnapshot.po
index 747a1361332..f07bd2fee2d 100644
--- a/tde-i18n-cy/messages/kdegraphics/ksnapshot.po
+++ b/tde-i18n-cy/messages/kdegraphics/ksnapshot.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/ksnapshot.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/ksnapshot.po\n"
 "POT-Creation-Date: 2006-07-01 03:59+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/ksvgplugin.po b/tde-i18n-cy/messages/kdegraphics/ksvgplugin.po
index 55af4d20f3d..031e79b8c39 100644
--- a/tde-i18n-cy/messages/kdegraphics/ksvgplugin.po
+++ b/tde-i18n-cy/messages/kdegraphics/ksvgplugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/ksvgplugin.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/ksvgplugin.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kuickshow.po b/tde-i18n-cy/messages/kdegraphics/kuickshow.po
index ab82b84929f..b6fb074a92b 100644
--- a/tde-i18n-cy/messages/kdegraphics/kuickshow.po
+++ b/tde-i18n-cy/messages/kdegraphics/kuickshow.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kuickshow.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kuickshow.po\n"
 "POT-Creation-Date: 2007-03-26 02:14+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kview.po b/tde-i18n-cy/messages/kdegraphics/kview.po
index d51cbdddace..ea75faabd9b 100644
--- a/tde-i18n-cy/messages/kdegraphics/kview.po
+++ b/tde-i18n-cy/messages/kdegraphics/kview.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kview.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kview.po\n"
 "POT-Creation-Date: 2005-03-07 01:42+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kview_scale.po b/tde-i18n-cy/messages/kdegraphics/kview_scale.po
index 2f798bb2bc5..d8e76b40009 100644
--- a/tde-i18n-cy/messages/kdegraphics/kview_scale.po
+++ b/tde-i18n-cy/messages/kdegraphics/kview_scale.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kview_scale.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kview_scale.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewbrowserplugin.po b/tde-i18n-cy/messages/kdegraphics/kviewbrowserplugin.po
index 5e1e45ea068..043f53e8aa9 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewbrowserplugin.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewbrowserplugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewbrowserplugin.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewbrowserplugin.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewcanvas.po b/tde-i18n-cy/messages/kdegraphics/kviewcanvas.po
index b20f482c45d..b5eb093e2a8 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewcanvas.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewcanvas.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewcanvas.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewcanvas.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kvieweffectsplugin.po b/tde-i18n-cy/messages/kdegraphics/kvieweffectsplugin.po
index 67f1980bb6e..ee71fc59b25 100644
--- a/tde-i18n-cy/messages/kdegraphics/kvieweffectsplugin.po
+++ b/tde-i18n-cy/messages/kdegraphics/kvieweffectsplugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kvieweffectsplugin.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kvieweffectsplugin.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewpresenterplugin.po b/tde-i18n-cy/messages/kdegraphics/kviewpresenterplugin.po
index a2354d791a7..684ad9af6c5 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewpresenterplugin.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewpresenterplugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewpresenterplugin.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewpresenterplugin.po\n"
 "POT-Creation-Date: 2005-01-31 01:31+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewscannerplugin.po b/tde-i18n-cy/messages/kdegraphics/kviewscannerplugin.po
index 9e84023868a..018cb62d3c6 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewscannerplugin.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewscannerplugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewscannerplugin.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewscannerplugin.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewshell.po b/tde-i18n-cy/messages/kdegraphics/kviewshell.po
index 9b8881829b1..11c3256450a 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewshell.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewshell.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewshell.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewshell.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/kviewviewer.po b/tde-i18n-cy/messages/kdegraphics/kviewviewer.po
index cb14cb76ede..0044c44d731 100644
--- a/tde-i18n-cy/messages/kdegraphics/kviewviewer.po
+++ b/tde-i18n-cy/messages/kdegraphics/kviewviewer.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/kviewviewer.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/kviewviewer.po\n"
 "POT-Creation-Date: 2005-07-24 01:35+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdegraphics/libkscan.po b/tde-i18n-cy/messages/kdegraphics/libkscan.po
index f2e28a5a8f4..63ee98f47bd 100644
--- a/tde-i18n-cy/messages/kdegraphics/libkscan.po
+++ b/tde-i18n-cy/messages/kdegraphics/libkscan.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdegraphics/libkscan.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/libkscan.po\n"
 "POT-Creation-Date: 2008-02-01 01:56+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/Makefile.in b/tde-i18n-cy/messages/kdelibs/Makefile.in
index a1ddd94c482..ee4b68cf724 100644
--- a/tde-i18n-cy/messages/kdelibs/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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-cy/messages/kdelibs/cupsdconf.po b/tde-i18n-cy/messages/kdelibs/cupsdconf.po
index 36a25be1d29..beab725dbf7 100644
--- a/tde-i18n-cy/messages/kdelibs/cupsdconf.po
+++ b/tde-i18n-cy/messages/kdelibs/cupsdconf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdelibs/cupsdconf.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/cupsdconf.po\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/kabc_sql.po b/tde-i18n-cy/messages/kdelibs/kabc_sql.po
index 677f3df4d80..db8a37f4908 100644
--- a/tde-i18n-cy/messages/kdelibs/kabc_sql.po
+++ b/tde-i18n-cy/messages/kdelibs/kabc_sql.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdelibs/kabc_sql.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/kabc_sql.po\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-05-08 21:18+0000\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/kdelibs.po b/tde-i18n-cy/messages/kdelibs/kdelibs.po
index d3610e09cf9..32da93a4ded 100644
--- a/tde-i18n-cy/messages/kdelibs/kdelibs.po
+++ b/tde-i18n-cy/messages/kdelibs/kdelibs.po
@@ -1,6 +1,6 @@
-# Cyfieithiad o kdelibs.po i Cymraeg
-# translation of kdelibs.po to Cymraeg
-# Translation of kdelibs.po to Cymraeg
+# Cyfieithiad o tdelibs.po i Cymraeg
+# translation of tdelibs.po to Cymraeg
+# Translation of tdelibs.po to Cymraeg
 # Translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzy.po to Cymraeg
@@ -16,7 +16,7 @@
 #
 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: 2005-01-28 17:54+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
@@ -53,19 +53,19 @@ msgstr ""
 msgid "&Certificate"
 msgstr "&Tystysgrif"
 
-#. 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 "Byrlwybr arall:"
 
-#. 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 "Prif fyrlwybr:"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 155
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 155
 #: rc.cpp:18
 #, no-c-format
 msgid ""
@@ -74,31 +74,31 @@ msgstr ""
 "Bydd y byrlwybr sydd mewn bod yn barod, neu'r byrlwybr yr ydych yn ei fewnosod, "
 "yn ymddangos yma."
 
-#. 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 "Diddymu byrlwybr"
 
-#. 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 "Modd aml-fysell"
 
-#. 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 "Galluogi mewnosod byrlwybrau aml-fysell"
 
-#. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 219
+#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 219
 #: rc.cpp:39
 #, no-c-format
 msgid ""
@@ -110,25 +110,25 @@ msgstr ""
 "aml-allwedd yn ddilyniant o hyd at 4 allwedd.  Er enghraifft, gallwch ddiffinio "
 "\"Ctrl+F,B\" i Wynebfath-Italig a \"Ctrl+F,U\" i Wynebfath-Danlinellu."
 
-#. 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 "&Ffeil"
 
-#. 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êm"
 
-#. 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 "&Golygu"
 
-#. i18n: file ./kdeui/ui_standards.rc line 80
+#. i18n: file ./tdeui/ui_standards.rc line 80
 #: rc.cpp:51
 #, no-c-format
 msgid ""
@@ -136,61 +136,61 @@ msgid ""
 "&Move"
 msgstr "&Symud"
 
-#. 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 "&Golwg"
 
-#. 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 "&Mynd"
 
-#. 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 "&Tudnodau"
 
-#. 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 "&Offer"
 
-#. 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 "Gosod&iadau"
 
-#. 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 "Prif Far Offer"
 
-#. 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 "Byrlwybr:"
 
-#. 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 "Gair anhysbys"
 
-#. 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 ""
@@ -221,25 +221,25 @@ msgstr ""
 "blwch testun isod, a clicio <b>Amnewid</b> neu <b>Amnewid Pob Un</b>.</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 "<b>wedi'i gamsillafu</b>"
 
-#. 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 "Gair anhysbys"
 
-#. 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 "&Iaith:"
 
-#. 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 ""
@@ -251,19 +251,19 @@ msgstr ""
 "<p>Dewiswch iaith y ddogfen a broflennir yma.</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 "... y gair <b>a gamsillafwyd</b> yn ei gyd-destun ..."
 
-#. 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 "Detholiad arbrawf sy'n dangos y gair anhysbys yn ei gyd-destun."
 
-#. i18n: file ./kdeui/kspellui.ui line 99
+#. i18n: file ./tdeui/kspellui.ui line 99
 #: rc.cpp:125 rc.cpp:342
 #, no-c-format
 msgid ""
@@ -282,13 +282,13 @@ msgstr ""
 "proflennu.</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 "<< Ychwanegu i'r Geiriadur"
 
-#. i18n: file ./kdeui/kspellui.ui line 113
+#. i18n: file ./tdeui/kspellui.ui line 113
 #: rc.cpp:133 rc.cpp:350
 #, no-c-format
 msgid ""
@@ -312,13 +312,13 @@ msgstr ""
 "Anwybyddu</b> neu <b>Anwybyddu Pob Un</b> yn lle.</p>\n"
 "</qt>"
 
-#. 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 "Amnewid y &Cwbl"
 
-#. i18n: file ./kdeui/kspellui.ui line 143
+#. i18n: file ./tdeui/kspellui.ui line 143
 #: rc.cpp:142 rc.cpp:408
 #, no-c-format
 msgid ""
@@ -332,19 +332,19 @@ msgstr ""
 "blwch golygu uchod (i'r chwith).</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 "Geiriau Awgrymedig"
 
-#. 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 "Rhestr Awgrymiadau"
 
-#. i18n: file ./kdeui/kspellui.ui line 171
+#. i18n: file ./tdeui/kspellui.ui line 171
 #: rc.cpp:153 rc.cpp:362
 #, no-c-format
 msgid ""
@@ -366,13 +366,13 @@ msgstr ""
 "digwyddiad.</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 "&Amnewid"
 
-#. i18n: file ./kdeui/kspellui.ui line 184
+#. i18n: file ./tdeui/kspellui.ui line 184
 #: rc.cpp:162 rc.cpp:400
 #, no-c-format
 msgid ""
@@ -386,13 +386,13 @@ msgstr ""
 "y blwch golygu uchod (i'r chwith).</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 "Amnewid &efo:"
 
-#. 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 ""
@@ -412,13 +412,13 @@ msgstr ""
 "digwyddiad.</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 "&Anwybyddu:"
 
-#. i18n: file ./kdeui/kspellui.ui line 215
+#. i18n: file ./tdeui/kspellui.ui line 215
 #: rc.cpp:179 rc.cpp:416
 #, no-c-format
 msgid ""
@@ -436,13 +436,13 @@ msgstr ""
 "ychwanegu i'r geiriadur.</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 "A&nwybyddu Popeth:"
 
-#. 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 ""
@@ -461,19 +461,19 @@ msgstr ""
 "ychwanegu i'r geiriadur.</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 "A&wgrymu:"
 
-#. 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 "Saesneg"
 
-#. 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"
@@ -512,7 +512,7 @@ msgstr ""
 "problem."
 
 #. 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 "C&lirio"
@@ -580,7 +580,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"
@@ -735,7 +735,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: 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 "Ffurfweddu"
@@ -768,7 +768,7 @@ msgstr "Tudalen"
 msgid "Border"
 msgstr "Ymyl"
 
-#: common_texts.cpp:32 kdeui/ktoolbar.cpp:2116
+#: common_texts.cpp:32 tdeui/ktoolbar.cpp:2116
 msgid "Orientation"
 msgstr "Gogwydd"
 
@@ -853,7 +853,7 @@ msgid "&Zoom"
 msgstr "&Chwyddo"
 
 #: 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 "Gwall"
@@ -867,8 +867,8 @@ msgid "Charset:"
 msgstr "Set nodau:"
 
 #: 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 "Rhybudd"
 
@@ -884,8 +884,8 @@ msgstr "Cynnwys"
 msgid "About"
 msgstr "Ynghylch"
 
-#: 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 "&Ynghylch"
 
@@ -897,10 +897,10 @@ msgstr "Y&nghylch"
 msgid "Untitled"
 msgstr "Heb deitl"
 
-#: 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 "&Iawn"
 
@@ -912,15 +912,15 @@ msgstr "Ymlaen"
 msgid "Off"
 msgstr "I ffwrdd"
 
-#: 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 "&Gosod"
 
-#: common_texts.cpp:74 kdecore/kstdaccel.cpp:52
+#: common_texts.cpp:74 tdecore/kstdaccel.cpp:52
 msgid "File"
 msgstr "Ffeil"
 
-#: common_texts.cpp:75 kdeui/kstdguiitem.cpp:120
+#: common_texts.cpp:75 tdeui/kstdguiitem.cpp:120
 msgid "&Discard"
 msgstr "&Taflu"
 
@@ -928,7 +928,7 @@ msgstr "&Taflu"
 msgid "Discard"
 msgstr "Taflu"
 
-#: common_texts.cpp:80 kdecore/kstdaccel.cpp:59
+#: common_texts.cpp:80 tdecore/kstdaccel.cpp:59
 msgid "Edit"
 msgstr "Golygu"
 
@@ -944,19 +944,19 @@ msgstr "Dangos"
 msgid "E&xit"
 msgstr "G&adael"
 
-#: common_texts.cpp:86 kdecore/kstdaccel.cpp:58
+#: common_texts.cpp:86 tdecore/kstdaccel.cpp:58
 msgid "Quit"
 msgstr "Terfynu"
 
-#: 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 "&Gorffen"
 
-#: 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 "Ail-lwytho"
 
-#: common_texts.cpp:89 kdecore/kstdaccel.cpp:86
+#: common_texts.cpp:89 tdecore/kstdaccel.cpp:86
 msgid "Back"
 msgstr "Yn ôl"
 
@@ -980,7 +980,7 @@ msgstr "Gêm Newydd"
 msgid "&New Game"
 msgstr "&Gêm Newydd"
 
-#: 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 "Agor"
 
@@ -992,7 +992,7 @@ msgstr "Agor Ffeil"
 msgid "Open..."
 msgstr "Agor..."
 
-#: 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 "&Agor..."
 
@@ -1004,7 +1004,7 @@ msgstr "&Torri"
 msgid "C&ut"
 msgstr "T&orri"
 
-#: common_texts.cpp:106 kdeui/kfontdialog.cpp:132
+#: common_texts.cpp:106 tdeui/kfontdialog.cpp:132
 msgid "Font"
 msgstr "Wynebfath"
 
@@ -1016,11 +1016,11 @@ msgstr "&Lliw Blaendir"
 msgid "&Background Color"
 msgstr "&Lliw Cefndir"
 
-#: common_texts.cpp:109 kdecore/kstdaccel.cpp:56
+#: common_texts.cpp:109 tdecore/kstdaccel.cpp:56
 msgid "Save"
 msgstr "Cadw"
 
-#: 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 "&Cadw"
 
@@ -1037,20 +1037,20 @@ msgstr "Cadw Fel..."
 msgid "S&ave As..."
 msgstr "C&adw Fel..."
 
-#: 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 "&Argraffu"
 
-#: 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 "Ymddiheuriad"
 
-#: 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 "Tynnu ymaith"
 
-#: common_texts.cpp:120 kdeui/kstdguiitem.cpp:264
+#: common_texts.cpp:120 tdeui/kstdguiitem.cpp:264
 msgid "Add"
 msgstr "Ychwanegu"
 
@@ -1058,11 +1058,11 @@ msgstr "Ychwanegu"
 msgid "Change"
 msgstr "Newid"
 
-#: common_texts.cpp:123 kdeui/kstdguiitem.cpp:220
+#: common_texts.cpp:123 tdeui/kstdguiitem.cpp:220
 msgid "&Delete"
 msgstr "&Dileu"
 
-#: 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 "Italig"
 
@@ -1070,7 +1070,7 @@ msgstr "Italig"
 msgid "Roman"
 msgstr "Rhyfeinig"
 
-#: common_texts.cpp:132 kdeui/kmessagebox.cpp:913
+#: common_texts.cpp:132 tdeui/kmessagebox.cpp:913
 msgid "Information"
 msgstr "Gwybodaeth"
 
@@ -1090,14 +1090,14 @@ msgstr "cysylltiedig yn lleol"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: 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 "Aros"
 
-#: common_texts.cpp:138 kdeui/keditlistbox.cpp:136
+#: common_texts.cpp:138 tdeui/keditlistbox.cpp:136
 #: kresources/configpage.cpp:127
 msgid "&Remove"
 msgstr "&Tynnu ymaith"
@@ -1106,7 +1106,7 @@ msgstr "&Tynnu ymaith"
 msgid "&Properties..."
 msgstr "&Priodweddau"
 
-#: common_texts.cpp:140 kdeui/kstdguiitem.cpp:279
+#: common_texts.cpp:140 tdeui/kstdguiitem.cpp:279
 msgid "Properties"
 msgstr "Priodweddau"
 
@@ -1154,36 +1154,36 @@ msgstr "Adfer"
 msgid "Appearance"
 msgstr "Golwg"
 
-#: 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 "Argraffu"
 
-#: common_texts.cpp:153 kdecore/kcalendarsystem.cpp:135
+#: common_texts.cpp:153 tdecore/kcalendarsystem.cpp:135
 msgid "Monday"
 msgstr "Dydd Llun"
 
-#: common_texts.cpp:154 kdecore/kcalendarsystem.cpp:136
+#: common_texts.cpp:154 tdecore/kcalendarsystem.cpp:136
 msgid "Tuesday"
 msgstr "Dydd Mawrth"
 
-#: common_texts.cpp:155 kdecore/kcalendarsystem.cpp:137
+#: common_texts.cpp:155 tdecore/kcalendarsystem.cpp:137
 msgid "Wednesday"
 msgstr "Dydd Mercher"
 
-#: common_texts.cpp:156 kdecore/kcalendarsystem.cpp:138
+#: common_texts.cpp:156 tdecore/kcalendarsystem.cpp:138
 msgid "Thursday"
 msgstr "Dydd Iau"
 
-#: common_texts.cpp:157 kdecore/kcalendarsystem.cpp:139
+#: common_texts.cpp:157 tdecore/kcalendarsystem.cpp:139
 msgid "Friday"
 msgstr "Dydd Gwener"
 
-#: common_texts.cpp:158 kdecore/kcalendarsystem.cpp:140
+#: common_texts.cpp:158 tdecore/kcalendarsystem.cpp:140
 msgid "Saturday"
 msgstr "Dydd Sadwrn"
 
-#: common_texts.cpp:159 kdecore/kcalendarsystem.cpp:141
+#: common_texts.cpp:159 tdecore/kcalendarsystem.cpp:141
 msgid "Sunday"
 msgstr "Dydd Sul"
 
@@ -1203,33 +1203,33 @@ msgstr "&Golwg Newydd"
 msgid "&Insert"
 msgstr "&Mewnosod"
 
-#: common_texts.cpp:168 kdeui/ktip.cpp:297
+#: common_texts.cpp:168 tdeui/ktip.cpp:297
 msgid ""
 "_: Opposite to Previous\n"
 "&Next"
 msgstr "&Nesaf"
 
-#: common_texts.cpp:169 kdeui/ktip.cpp:292
+#: common_texts.cpp:169 tdeui/ktip.cpp:292
 msgid "&Previous"
 msgstr "&Blaenorol"
 
 #: 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 "Amnewid"
 
-#: common_texts.cpp:171 kdeui/kstdaction_p.h:65
+#: common_texts.cpp:171 tdeui/kstdaction_p.h:65
 msgid "&Replace..."
 msgstr "&Amnewid"
 
 #: 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 "Rhagosodol"
 
-#: common_texts.cpp:174 kdeui/kstdguiitem.cpp:180
+#: common_texts.cpp:174 tdeui/kstdguiitem.cpp:180
 msgid "&Defaults"
 msgstr "&Rhagosodiadau"
 
@@ -1241,15 +1241,15 @@ msgstr "&Cynnwys"
 msgid "Open Recent"
 msgstr "Agor Diweddar"
 
-#: common_texts.cpp:178 kdeui/kstdaction_p.h:42
+#: common_texts.cpp:178 tdeui/kstdaction_p.h:42
 msgid "Open &Recent"
 msgstr "Agor &Diweddar"
 
-#: 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 "&Canfod"
 
-#: common_texts.cpp:180 kdeui/kstdaction_p.h:62
+#: common_texts.cpp:180 tdeui/kstdaction_p.h:62
 msgid "Find &Next"
 msgstr "Canfod &Nesaf"
 
@@ -1257,7 +1257,7 @@ msgstr "Canfod &Nesaf"
 msgid "Bookmarks"
 msgstr "Tudnodau"
 
-#: common_texts.cpp:183 kdeui/kstdaction_p.h:90
+#: common_texts.cpp:183 tdeui/kstdaction_p.h:90
 msgid "&Add Bookmark"
 msgstr "&Ychwanegu Tudnod"
 
@@ -1265,16 +1265,16 @@ msgstr "&Ychwanegu Tudnod"
 msgid "&Edit Bookmarks..."
 msgstr "&Golygu Tudnodau..."
 
-#: common_texts.cpp:186 kdeui/kstdaction_p.h:93
+#: common_texts.cpp:186 tdeui/kstdaction_p.h:93
 msgid "&Spelling..."
 msgstr "&Sillafu..."
 
-#: 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 "Dangos &Dewislen"
 
-#: 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 "Dangos Bar &Offer"
 
@@ -1290,7 +1290,7 @@ msgstr "Ffurfweddu &Rhwymiadau Bysell..."
 msgid "&Preferences..."
 msgstr "&Hoffiannau ..."
 
-#: common_texts.cpp:193 kdeui/kmessagebox.cpp:928
+#: common_texts.cpp:193 tdeui/kmessagebox.cpp:928
 msgid "Do not show this message again"
 msgstr "Peidiwch â dangos y neges yma eto"
 
@@ -1692,7 +1692,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 "Ebost"
 
@@ -1852,7 +1852,7 @@ msgstr "Facs Cartref"
 msgid "Work Fax"
 msgstr "Ffacs Gwaith"
 
-#: 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 "Eraill"
 
@@ -2093,7 +2093,7 @@ msgstr "Stryd"
 msgid "Locality"
 msgstr "Lleoliad"
 
-#: kabc/address.cpp:217 kdeui/ktimezonewidget.cpp:46
+#: kabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
 msgid "Region"
 msgstr "Ardal"
 
@@ -2354,7 +2354,7 @@ msgstr "Dyddiad Addasiad"
 msgid "Sort String"
 msgstr "Llinyn Trefnu"
 
-#: kabc/addressee.cpp:841 kdeui/kaboutdialog.cpp:92
+#: kabc/addressee.cpp:841 tdeui/kaboutdialog.cpp:92
 msgid "Homepage"
 msgstr "Tudalen gartref"
 
@@ -2445,7 +2445,7 @@ msgid "kde-menu"
 msgstr "kde-menu"
 
 #: 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 "Awdur"
 
@@ -2647,13 +2647,13 @@ msgstr "Golwg Offer Cynt"
 msgid "Next Tool View"
 msgstr "Golwg Offer Nesaf"
 
-#: 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 "Dangos %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"
@@ -2744,7 +2744,7 @@ msgstr "Ch&wyddo"
 msgid "&Maximize"
 msgstr "&Chwyddo"
 
-#: kdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
+#: tdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
 msgid "&Minimize"
 msgstr "Llei&hau"
 
@@ -2766,26 +2766,26 @@ msgid ""
 "Overlap"
 msgstr "Gorgyffwrdd"
 
-#: kdecore/klibloader.cpp:157
+#: tdecore/klibloader.cpp:157
 msgid "The library %1 does not offer an %2 function."
 msgstr "Nid y'w rhaglengell %1 yn cynnig swyddogaeth %2."
 
-#: kdecore/klibloader.cpp:168
+#: tdecore/klibloader.cpp:168
 msgid "The library %1 does not offer a KDE compatible factory."
 msgstr "Nid yw'r rhaglengell %1 yn cynnig ffatri sy'n cyfaddas i KDE."
 
-#: kdecore/klibloader.cpp:425
+#: tdecore/klibloader.cpp:425
 msgid "Library files for \"%1\" not found in paths."
 msgstr "Ni chanfuwyd ffeiliau llyfrgell ar gyfer \"%1\" ymysg y llwybrau."
 
-#: 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"
@@ -2795,7 +2795,7 @@ msgstr ""
 "ddychwelwyd gan y cysawd oedd:\n"
 "\n"
 
-#: kdecore/kapplication.cpp:1408
+#: tdecore/kapplication.cpp:1408
 msgid ""
 "\n"
 "\n"
@@ -2805,23 +2805,23 @@ msgstr ""
 "\n"
 "Gwiriwch fod y rhaglen \"dcopserver\" yn rhedeg!"
 
-#: kdecore/kapplication.cpp:1415
+#: tdecore/kapplication.cpp:1415
 msgid "DCOP communications error (%1)"
 msgstr "Gwall cyfathrebu DCOP (%1)"
 
-#: kdecore/kapplication.cpp:1433
+#: tdecore/kapplication.cpp:1433
 msgid "Use the X-server display 'displayname'"
 msgstr "Defnyddio'r arddangosydd gweinydd-X 'displayname'"
 
-#: kdecore/kapplication.cpp:1435
+#: tdecore/kapplication.cpp:1435
 msgid "Use the QWS display 'displayname'"
 msgstr "Defnyddio'r arddangosydd QWS 'displayname'"
 
-#: kdecore/kapplication.cpp:1437
+#: tdecore/kapplication.cpp:1437
 msgid "Restore the application for the given 'sessionId'"
 msgstr "Adfer y cymhwysiad ar gyfer y 'sessionId' a rhoddwyd"
 
-#: kdecore/kapplication.cpp:1438
+#: tdecore/kapplication.cpp:1438
 msgid ""
 "Causes the application to install a private color\n"
 "map on an 8-bit display"
@@ -2829,7 +2829,7 @@ msgstr ""
 " Achosi i'r cymhwysiad arsefydlu map lliw\n"
 " preifat ar arddangosydd 8-did"
 
-#: 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"
@@ -2840,11 +2840,11 @@ msgstr ""
 " lliw ar arddangosydd 8-did, os mae'r cymhwysiad\n"
 " yn defnyddio y penodiad QApplication::ManyColor"
 
-#: kdecore/kapplication.cpp:1440
+#: tdecore/kapplication.cpp:1440
 msgid "tells Qt to never grab the mouse or the keyboard"
 msgstr "Dweud wrth QT na ddylai fyth dwyn y llygoden na'r bysellfwrdd"
 
-#: kdecore/kapplication.cpp:1441
+#: tdecore/kapplication.cpp:1441
 msgid ""
 "running under a debugger can cause an implicit\n"
 "-nograb, use -dograb to override"
@@ -2852,15 +2852,15 @@ msgstr ""
 "gall redeg dan ddadnamydd achosi -nograb\n"
 "ymhlyg, defnyddiwch -dograb i'w anwybyddu"
 
-#: kdecore/kapplication.cpp:1442
+#: tdecore/kapplication.cpp:1442
 msgid "switches to synchronous mode for debugging"
 msgstr "newid i fodd cydamseredig i ddadnamu"
 
-#: kdecore/kapplication.cpp:1444
+#: tdecore/kapplication.cpp:1444
 msgid "defines the application font"
 msgstr "diffinio wynebfath y cymhwysiad"
 
-#: 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"
@@ -2870,23 +2870,23 @@ msgstr ""
 "palêt cymhwysiad (mae cysgodau\n"
 " golau a tywyll yn cael eu cyfrifo)"
 
-#: kdecore/kapplication.cpp:1448
+#: tdecore/kapplication.cpp:1448
 msgid "sets the default foreground color"
 msgstr "Gosod y lliw blaendir rhagosodol"
 
-#: kdecore/kapplication.cpp:1450
+#: tdecore/kapplication.cpp:1450
 msgid "sets the default button color"
 msgstr "Gosod y lliw botwm rhagosodol"
 
-#: kdecore/kapplication.cpp:1451
+#: tdecore/kapplication.cpp:1451
 msgid "sets the application name"
 msgstr "gosod enw'r cymhwysiad"
 
-#: kdecore/kapplication.cpp:1452
+#: tdecore/kapplication.cpp:1452
 msgid "sets the application title (caption)"
 msgstr "gosod teitl y cymhwysiad (egluryn)"
 
-#: kdecore/kapplication.cpp:1454
+#: tdecore/kapplication.cpp:1454
 msgid ""
 "forces the application to use a TrueColor visual on\n"
 "an 8-bit display"
@@ -2894,7 +2894,7 @@ msgstr ""
 "gorfod i'r cymhwysiad ddefnydio \n"
 " gwelediad WirLiw ar arddangosydd 8-did"
 
-#: 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"
@@ -2903,76 +2903,76 @@ msgstr ""
 "gosod arddull fewnbwn XIM (X Input Method). Gwerthoedd\n"
 "posib yw onthespot, overthespot, offthespot a root"
 
-#: kdecore/kapplication.cpp:1456
+#: tdecore/kapplication.cpp:1456
 msgid "set XIM server"
 msgstr "gosod gweinydd XIM"
 
-#: kdecore/kapplication.cpp:1457
+#: tdecore/kapplication.cpp:1457
 msgid "disable XIM"
 msgstr "analluogi XIM"
 
-#: kdecore/kapplication.cpp:1460
+#: tdecore/kapplication.cpp:1460
 msgid "forces the application to run as QWS Server"
 msgstr "gorfod i'r cymhwysiad redeg fel Gweinydd QWS"
 
-#: kdecore/kapplication.cpp:1462
+#: tdecore/kapplication.cpp:1462
 msgid "mirrors the whole layout of widgets"
 msgstr "adlewyrchu gosodiad cyfan y celfigion"
 
-#: kdecore/kapplication.cpp:1468
+#: tdecore/kapplication.cpp:1468
 msgid "Use 'caption' as name in the titlebar"
 msgstr "defnyddio 'egluryn' fel enw yn y bar-teitl"
 
-#: kdecore/kapplication.cpp:1469
+#: tdecore/kapplication.cpp:1469
 msgid "Use 'icon' as the application icon"
 msgstr "defnyddio 'eicon' fel eicon y cymhwysiad"
 
-#: kdecore/kapplication.cpp:1470
+#: tdecore/kapplication.cpp:1470
 msgid "Use 'icon' as the icon in the titlebar"
 msgstr "defnyddio 'eicon' fel eicon yn y bar-teitl"
 
-#: kdecore/kapplication.cpp:1471
+#: tdecore/kapplication.cpp:1471
 msgid "Use alternative configuration file"
 msgstr "defnyddio ffeil ffurfweddiad arall"
 
-#: kdecore/kapplication.cpp:1472
+#: tdecore/kapplication.cpp:1472
 msgid "Use the DCOP Server specified by 'server'"
 msgstr "defnyddio'r gweinydd DCOP a penodir gan 'gweinydd'"
 
-#: kdecore/kapplication.cpp:1473
+#: tdecore/kapplication.cpp:1473
 msgid "Disable crash handler, to get core dumps"
 msgstr "analluogi'r trinydd chwalfa, er mwyn cael dadlwythiadau craidd"
 
-#: kdecore/kapplication.cpp:1474
+#: tdecore/kapplication.cpp:1474
 msgid "Waits for a WM_NET compatible windowmanager"
 msgstr "aros am reolydd ffenestri sy'n gyfaddas i WM_NET"
 
-#: kdecore/kapplication.cpp:1475
+#: tdecore/kapplication.cpp:1475
 msgid "sets the application GUI style"
 msgstr "gosod arddull GUI y cymhwysiad"
 
-#: kdecore/kapplication.cpp:1476
+#: tdecore/kapplication.cpp:1476
 #, fuzzy
 msgid ""
 "sets the client geometry of the main widget - see man X for the argument format"
 msgstr "gosod geometreg dibynnol y prif gelfigyn"
 
-#: kdecore/kapplication.cpp:1516
+#: tdecore/kapplication.cpp:1516
 msgid ""
 "The style %1 was not found\n"
 msgstr ""
 "Methu darganfod yr ardull %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 "newidwyd"
 
-#: kdecore/kapplication.cpp:2244 kdecore/kapplication.cpp:2279
+#: tdecore/kapplication.cpp:2244 tdecore/kapplication.cpp:2279
 msgid "Could not Launch Help Center"
 msgstr "Methodd gychwyn Canolfan Gymorth"
 
-#: 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"
@@ -2983,11 +2983,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2550
+#: tdecore/kapplication.cpp:2550
 msgid "Could not Launch Mail Client"
 msgstr "Methodd gychwyn Dibynnydd Ebost"
 
-#: kdecore/kapplication.cpp:2551
+#: tdecore/kapplication.cpp:2551
 #, c-format
 msgid ""
 "Could not launch the mail client:\n"
@@ -2998,11 +2998,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2572
+#: tdecore/kapplication.cpp:2572
 msgid "Could not Launch Browser"
 msgstr "Methodd gychwyn Porydd"
 
-#: kdecore/kapplication.cpp:2573
+#: tdecore/kapplication.cpp:2573
 #, c-format
 msgid ""
 "Could not launch the browser:\n"
@@ -3013,48 +3013,48 @@ msgstr ""
 "\n"
 "%1"
 
-#: kdecore/kapplication.cpp:2637
+#: tdecore/kapplication.cpp:2637
 msgid ""
 "Could not register with DCOP.\n"
 msgstr ""
 "Methodd gofrestru gyda DCOP.\n"
 
-#: kdecore/kapplication.cpp:2672
+#: tdecore/kapplication.cpp:2672
 msgid ""
 "KLauncher could not be reached via DCOP.\n"
 msgstr ""
 "Methodd gyrraedd Klauncher drwy DCOP.\n"
 
-#: kdecore/kwinmodule.cpp:456
+#: tdecore/twinmodule.cpp:456
 #, c-format
 msgid "Desktop %1"
 msgstr "Penbwrdd %1"
 
-#: kdecore/kconfigbackend.cpp:1107 kdecore/kconfigbackend.cpp:1116
+#: tdecore/kconfigbackend.cpp:1107 tdecore/kconfigbackend.cpp:1116
 msgid ""
 "Will not save configuration.\n"
 msgstr ""
 "Ni fydd yn cadw'r ffurfweddiad.\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 ""
 "Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\". \n"
 
-#: kdecore/kconfigbackend.cpp:1124
+#: tdecore/kconfigbackend.cpp:1124
 msgid "Please contact your system administrator."
 msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
 
-#: kdecore/kcmdlineargs.cpp:500 kdecore/kcmdlineargs.cpp:516
+#: tdecore/kcmdlineargs.cpp:500 tdecore/kcmdlineargs.cpp:516
 msgid "Unknown option '%1'."
 msgstr "Dewis anhysbys '%1'."
 
-#: kdecore/kcmdlineargs.cpp:524
+#: tdecore/kcmdlineargs.cpp:524
 msgid "'%1' missing."
 msgstr "'%1' ar goll."
 
-#: 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"
@@ -3063,12 +3063,12 @@ msgstr ""
 "ysgrifennwyd %1 gan\n"
 "%2"
 
-#: kdecore/kcmdlineargs.cpp:622
+#: tdecore/kcmdlineargs.cpp:622
 #, fuzzy
 msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "Ysgrifennwyd %1 gan berson sy'n dymuno aros yn anhysbys."
 
-#: kdecore/kcmdlineargs.cpp:629
+#: tdecore/kcmdlineargs.cpp:629
 #, fuzzy
 msgid ""
 "Please use http://bugs.kde.org to report bugs.\n"
@@ -3076,7 +3076,7 @@ msgstr ""
 "Defnyddiwch http://bugs.kde.org er mwyn adrodd namau, peidiwch ac anfon ebost "
 "i'r awduron yn uniongyrchol.\n"
 
-#: kdecore/kcmdlineargs.cpp:632 kdecore/kcmdlineargs.cpp:634
+#: tdecore/kcmdlineargs.cpp:632 tdecore/kcmdlineargs.cpp:634
 #, fuzzy
 msgid ""
 "Please report bugs to %1.\n"
@@ -3084,15 +3084,15 @@ msgstr ""
 "Defnyddiwch %1 er mwyn adrodd namau, peidiwch ac anfon ebost i'r awduron yn "
 "uniongyrchol.\n"
 
-#: kdecore/kcmdlineargs.cpp:660
+#: tdecore/kcmdlineargs.cpp:660
 msgid "Unexpected argument '%1'."
 msgstr "Ymresymiad annisgwyl '%1'."
 
-#: kdecore/kcmdlineargs.cpp:765
+#: tdecore/kcmdlineargs.cpp:765
 msgid "Use --help to get a list of available command line options."
 msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
 
-#: kdecore/kcmdlineargs.cpp:780
+#: tdecore/kcmdlineargs.cpp:780
 msgid ""
 "\n"
 "%1:\n"
@@ -3100,57 +3100,57 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: kdecore/kcmdlineargs.cpp:789
+#: tdecore/kcmdlineargs.cpp:789
 msgid "[options] "
 msgstr "[dewisiadau]"
 
-#: kdecore/kcmdlineargs.cpp:796
+#: tdecore/kcmdlineargs.cpp:796
 msgid "[%1-options]"
 msgstr "[%1-dewisiadau]"
 
-#: kdecore/kcmdlineargs.cpp:816
+#: tdecore/kcmdlineargs.cpp:816
 msgid ""
 "Usage: %1 %2\n"
 msgstr ""
 "Defnyddir: %1 %2\n"
 
-#: kdecore/kcmdlineargs.cpp:819
+#: tdecore/kcmdlineargs.cpp:819
 msgid "Generic options"
 msgstr "Dewisiadau generig"
 
-#: kdecore/kcmdlineargs.cpp:820
+#: tdecore/kcmdlineargs.cpp:820
 msgid "Show help about options"
 msgstr "Dangos cymorth am ddewisiadau"
 
-#: kdecore/kcmdlineargs.cpp:828
+#: tdecore/kcmdlineargs.cpp:828
 msgid "Show %1 specific options"
 msgstr "Dangos %1 dewisiadau penodol"
 
-#: kdecore/kcmdlineargs.cpp:835
+#: tdecore/kcmdlineargs.cpp:835
 msgid "Show all options"
 msgstr "Dangos y dewisiadau i gyd"
 
-#: kdecore/kcmdlineargs.cpp:836
+#: tdecore/kcmdlineargs.cpp:836
 msgid "Show author information"
 msgstr "Dangos gwybodaeth awdur"
 
-#: kdecore/kcmdlineargs.cpp:837
+#: tdecore/kcmdlineargs.cpp:837
 msgid "Show version information"
 msgstr "Dangos gwybodaeth fersiwn"
 
-#: kdecore/kcmdlineargs.cpp:838
+#: tdecore/kcmdlineargs.cpp:838
 msgid "Show license information"
 msgstr "Dangos gwybodaeth trwydded"
 
-#: kdecore/kcmdlineargs.cpp:839
+#: tdecore/kcmdlineargs.cpp:839
 msgid "End of options"
 msgstr "Diwedd y dewisiadau"
 
-#: kdecore/kcmdlineargs.cpp:861
+#: tdecore/kcmdlineargs.cpp:861
 msgid "%1 options"
 msgstr "%1 o ddewisiadau"
 
-#: kdecore/kcmdlineargs.cpp:863
+#: tdecore/kcmdlineargs.cpp:863
 msgid ""
 "\n"
 "Options:\n"
@@ -3158,7 +3158,7 @@ msgstr ""
 "\n"
 "Dewisiadau:\n"
 
-#: kdecore/kcmdlineargs.cpp:920
+#: tdecore/kcmdlineargs.cpp:920
 msgid ""
 "\n"
 "Arguments:\n"
@@ -3166,989 +3166,989 @@ msgstr ""
 "\n"
 "Ymresymiadau:\n"
 
-#: kdecore/kcmdlineargs.cpp:1282
+#: tdecore/kcmdlineargs.cpp:1282
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 "Bydd y ffeiliau/URLau a agorir gan y cymhwysiad yn cael eiu dileu wedi'u "
 "defnyddio"
 
-#: kdecore/ksockaddr.cpp:112
+#: tdecore/ksockaddr.cpp:112
 msgid "<unknown socket>"
 msgstr "<soced anhysbys>"
 
-#: kdecore/ksockaddr.cpp:568 kdecore/ksockaddr.cpp:587
+#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
 msgid "<empty>"
 msgstr "<gwag>"
 
-#: kdecore/ksockaddr.cpp:571
+#: tdecore/ksockaddr.cpp:571
 msgid ""
 "_: 1: hostname, 2: port number\n"
 "%1 port %2"
 msgstr "%1 porth %2"
 
-#: kdecore/ksockaddr.cpp:853
+#: tdecore/ksockaddr.cpp:853
 msgid "<empty UNIX socket>"
 msgstr "<soced Unix gwag>"
 
-#: kdecore/kcheckaccelerators.cpp:148
+#: tdecore/kcheckaccelerators.cpp:148
 msgid "Dr. Klash' Accelerator Diagnosis"
 msgstr "Diagnosis Cyflymydd Dr Klash"
 
-#: kdecore/kcheckaccelerators.cpp:155
+#: tdecore/kcheckaccelerators.cpp:155
 msgid "&Disable automatic checking"
 msgstr " &Analluogi cywiro awtomatig"
 
-#: kdecore/kcheckaccelerators.cpp:193
+#: tdecore/kcheckaccelerators.cpp:193
 msgid "<h2>Accelerators changed</h2>"
 msgstr "<h2>Newidwyd cyflymyddion</h2>"
 
-#: kdecore/kcheckaccelerators.cpp:199
+#: tdecore/kcheckaccelerators.cpp:199
 msgid "<h2>Accelerators removed</h2>"
 msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
 
-#: kdecore/kcheckaccelerators.cpp:204
+#: tdecore/kcheckaccelerators.cpp:204
 msgid "<h2>Accelerators added (just for your info)</h2>"
 msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
 
-#: kdecore/kstdaccel.cpp:54
+#: tdecore/kstdaccel.cpp:54
 msgid "New"
 msgstr "Newydd"
 
-#: kdecore/kstdaccel.cpp:65
+#: tdecore/kstdaccel.cpp:65
 msgid "Paste Selection"
 msgstr "Gludo'r Dewisiad"
 
-#: kdecore/kstdaccel.cpp:67
+#: tdecore/kstdaccel.cpp:67
 msgid "Deselect"
 msgstr "Dad-ddewis"
 
-#: kdecore/kstdaccel.cpp:68
+#: tdecore/kstdaccel.cpp:68
 msgid "Delete Word Backwards"
 msgstr "Dileu Gair yn Ôl"
 
-#: kdecore/kstdaccel.cpp:69
+#: tdecore/kstdaccel.cpp:69
 msgid "Delete Word Forward"
 msgstr "Dileu Gair Ymlaen"
 
-#: 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 "Canfod"
 
-#: kdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
+#: tdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
 msgid "Find Next"
 msgstr "Canfod Nesaf"
 
-#: kdecore/kstdaccel.cpp:72
+#: tdecore/kstdaccel.cpp:72
 msgid "Find Prev"
 msgstr "Canfod Blaenorol"
 
-#: kdecore/kstdaccel.cpp:74
+#: tdecore/kstdaccel.cpp:74
 msgid "Navigation"
 msgstr "Morlywiaeth"
 
-#: kdecore/kstdaccel.cpp:75
+#: tdecore/kstdaccel.cpp:75
 msgid ""
 "_: Opposite to End\n"
 "Home"
 msgstr "Cartref"
 
-#: kdecore/kstdaccel.cpp:76
+#: tdecore/kstdaccel.cpp:76
 msgid "End"
 msgstr "Diwedd"
 
-#: kdecore/kstdaccel.cpp:77
+#: tdecore/kstdaccel.cpp:77
 msgid "Beginning of Line"
 msgstr "Dechrau'r Llinell"
 
-#: kdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
+#: tdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
 msgid "End of Line"
 msgstr "Diwedd y Llinell"
 
-#: kdecore/kstdaccel.cpp:79
+#: tdecore/kstdaccel.cpp:79
 msgid "Prior"
 msgstr "Cynt"
 
-#: kdecore/kstdaccel.cpp:80
+#: tdecore/kstdaccel.cpp:80
 msgid ""
 "_: Opposite to Prior\n"
 "Next"
 msgstr "Nesaf"
 
-#: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976
+#: tdecore/kstdaccel.cpp:81 tdeui/keditcl2.cpp:976
 msgid "Go to Line"
 msgstr "Mynd i Linell"
 
-#: kdecore/kstdaccel.cpp:82
+#: tdecore/kstdaccel.cpp:82
 msgid "Add Bookmark"
 msgstr "Ychwanegu Tudnod"
 
-#: kdecore/kstdaccel.cpp:83
+#: tdecore/kstdaccel.cpp:83
 msgid "Zoom In"
 msgstr "Nesàu"
 
-#: kdecore/kstdaccel.cpp:84
+#: tdecore/kstdaccel.cpp:84
 msgid "Zoom Out"
 msgstr "Pellhàu"
 
-#: kdecore/kstdaccel.cpp:85
+#: tdecore/kstdaccel.cpp:85
 msgid "Up"
 msgstr "I fyny"
 
-#: kdecore/kstdaccel.cpp:87
+#: tdecore/kstdaccel.cpp:87
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: kdecore/kstdaccel.cpp:89
+#: tdecore/kstdaccel.cpp:89
 msgid "Popup Menu Context"
 msgstr "Cyd-destun Naidlen"
 
-#: kdecore/kstdaccel.cpp:90
+#: tdecore/kstdaccel.cpp:90
 msgid "Show Menu Bar"
 msgstr "Dangos y Bar Dewislen"
 
-#: kdecore/kstdaccel.cpp:91
+#: tdecore/kstdaccel.cpp:91
 msgid "Backward Word"
 msgstr "Yn Ôl un Gair"
 
-#: kdecore/kstdaccel.cpp:92
+#: tdecore/kstdaccel.cpp:92
 msgid "Forward Word"
 msgstr "Ymlaen un Gair"
 
-#: kdecore/kstdaccel.cpp:93
+#: tdecore/kstdaccel.cpp:93
 msgid "Activate Next Tab"
 msgstr "Gweithredoli'r Tab Nesaf"
 
-#: kdecore/kstdaccel.cpp:94
+#: tdecore/kstdaccel.cpp:94
 msgid "Activate Previous Tab"
 msgstr "Gweithredoli'r Tab Cynt"
 
-#: kdecore/kstdaccel.cpp:95
+#: tdecore/kstdaccel.cpp:95
 msgid "Full Screen Mode"
 msgstr "Modd Sgrîn Llawn"
 
-#: kdecore/kstdaccel.cpp:98
+#: tdecore/kstdaccel.cpp:98
 msgid "What's This"
 msgstr "Beth yw Hwn"
 
-#: 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 "Cwblhâd testun"
 
-#: kdecore/kstdaccel.cpp:101
+#: tdecore/kstdaccel.cpp:101
 msgid "Previous Completion Match"
 msgstr "Cydweddiad Cwblhâd Blaenorol"
 
-#: kdecore/kstdaccel.cpp:102
+#: tdecore/kstdaccel.cpp:102
 msgid "Next Completion Match"
 msgstr "Cydweddiad Cwblhâd Nesaf"
 
-#: kdecore/kstdaccel.cpp:103
+#: tdecore/kstdaccel.cpp:103
 msgid "Substring Completion"
 msgstr "Cwblhâd Is-linyn"
 
-#: kdecore/kstdaccel.cpp:104
+#: tdecore/kstdaccel.cpp:104
 msgid "Previous Item in List"
 msgstr "Eitem Cynt yn y Rhestr"
 
-#: kdecore/kstdaccel.cpp:105
+#: tdecore/kstdaccel.cpp:105
 msgid "Next Item in List"
 msgstr "Eitem Nesaf yn y Rhestr"
 
-#: 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 "o Muharram"
 
-#: kdecore/kcalendarsystemhijri.cpp:365 kdecore/kcalendarsystemhijri.cpp:393
+#: tdecore/kcalendarsystemhijri.cpp:365 tdecore/kcalendarsystemhijri.cpp:393
 msgid "of Safar"
 msgstr "o Safar"
 
-#: kdecore/kcalendarsystemhijri.cpp:367
+#: tdecore/kcalendarsystemhijri.cpp:367
 msgid "of R. Awal"
 msgstr "o R. Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:369
+#: tdecore/kcalendarsystemhijri.cpp:369
 msgid "of R. Thaani"
 msgstr "o R. Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:371
+#: tdecore/kcalendarsystemhijri.cpp:371
 msgid "of J. Awal"
 msgstr "o J. Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:373
+#: tdecore/kcalendarsystemhijri.cpp:373
 msgid "of J. Thaani"
 msgstr "o J. Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:375 kdecore/kcalendarsystemhijri.cpp:403
+#: tdecore/kcalendarsystemhijri.cpp:375 tdecore/kcalendarsystemhijri.cpp:403
 msgid "of Rajab"
 msgstr "o Rajab"
 
-#: kdecore/kcalendarsystemhijri.cpp:377 kdecore/kcalendarsystemhijri.cpp:405
+#: tdecore/kcalendarsystemhijri.cpp:377 tdecore/kcalendarsystemhijri.cpp:405
 msgid "of Sha`ban"
 msgstr "o Sha`ban"
 
-#: kdecore/kcalendarsystemhijri.cpp:379 kdecore/kcalendarsystemhijri.cpp:407
+#: tdecore/kcalendarsystemhijri.cpp:379 tdecore/kcalendarsystemhijri.cpp:407
 msgid "of Ramadan"
 msgstr "o Ramadan"
 
-#: kdecore/kcalendarsystemhijri.cpp:381 kdecore/kcalendarsystemhijri.cpp:409
+#: tdecore/kcalendarsystemhijri.cpp:381 tdecore/kcalendarsystemhijri.cpp:409
 msgid "of Shawwal"
 msgstr "o Shawwal"
 
-#: kdecore/kcalendarsystemhijri.cpp:383
+#: tdecore/kcalendarsystemhijri.cpp:383
 msgid "of Qi`dah"
 msgstr "o Qi`dah"
 
-#: kdecore/kcalendarsystemhijri.cpp:385
+#: tdecore/kcalendarsystemhijri.cpp:385
 msgid "of Hijjah"
 msgstr "o Hijjah"
 
-#: kdecore/kcalendarsystemhijri.cpp:395
+#: tdecore/kcalendarsystemhijri.cpp:395
 msgid "of Rabi` al-Awal"
 msgstr "o Rabi` al-Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:397
+#: tdecore/kcalendarsystemhijri.cpp:397
 msgid "of Rabi` al-Thaani"
 msgstr "o Rabi` al-Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:399
+#: tdecore/kcalendarsystemhijri.cpp:399
 msgid "of Jumaada al-Awal"
 msgstr "o Jumaada al-Awal"
 
-#: kdecore/kcalendarsystemhijri.cpp:401
+#: tdecore/kcalendarsystemhijri.cpp:401
 msgid "of Jumaada al-Thaani"
 msgstr "o Jumaada al-Thaani"
 
-#: kdecore/kcalendarsystemhijri.cpp:411
+#: tdecore/kcalendarsystemhijri.cpp:411
 msgid "of Thu al-Qi`dah"
 msgstr "o Thu al-Qi`dah"
 
-#: kdecore/kcalendarsystemhijri.cpp:413
+#: tdecore/kcalendarsystemhijri.cpp:413
 msgid "of Thu al-Hijjah"
 msgstr "o 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 thd@kde.org and coolo@kde.org, 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 "TwoForms"
 
-#: kdecore/kcalendarsystemgregorian.cpp:91 kdecore/klocale.cpp:553
+#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/klocale.cpp:553
 msgid ""
 "_: January\n"
 "Jan"
 msgstr "Ion"
 
-#: kdecore/kcalendarsystemgregorian.cpp:93 kdecore/klocale.cpp:554
+#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/klocale.cpp:554
 msgid ""
 "_: February\n"
 "Feb"
 msgstr "Chwe"
 
-#: kdecore/kcalendarsystemgregorian.cpp:95 kdecore/klocale.cpp:555
+#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/klocale.cpp:555
 msgid ""
 "_: March\n"
 "Mar"
 msgstr "Maw"
 
-#: kdecore/kcalendarsystemgregorian.cpp:97 kdecore/klocale.cpp:556
+#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/klocale.cpp:556
 msgid ""
 "_: April\n"
 "Apr"
 msgstr "Ebr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:99 kdecore/klocale.cpp:557
+#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/klocale.cpp:557
 msgid ""
 "_: May short\n"
 "May"
 msgstr "Mai"
 
-#: kdecore/kcalendarsystemgregorian.cpp:101 kdecore/klocale.cpp:558
+#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/klocale.cpp:558
 msgid ""
 "_: June\n"
 "Jun"
 msgstr "Meh"
 
-#: kdecore/kcalendarsystemgregorian.cpp:103 kdecore/klocale.cpp:559
+#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/klocale.cpp:559
 msgid ""
 "_: July\n"
 "Jul"
 msgstr "Gor"
 
-#: kdecore/kcalendarsystemgregorian.cpp:105 kdecore/klocale.cpp:560
+#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/klocale.cpp:560
 msgid ""
 "_: August\n"
 "Aug"
 msgstr "Awst"
 
-#: kdecore/kcalendarsystemgregorian.cpp:107 kdecore/klocale.cpp:561
+#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/klocale.cpp:561
 msgid ""
 "_: September\n"
 "Sep"
 msgstr "Medi"
 
-#: kdecore/kcalendarsystemgregorian.cpp:109 kdecore/klocale.cpp:562
+#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/klocale.cpp:562
 msgid ""
 "_: October\n"
 "Oct"
 msgstr "Hydr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:111 kdecore/klocale.cpp:563
+#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/klocale.cpp:563
 msgid ""
 "_: November\n"
 "Nov"
 msgstr "Tach"
 
-#: kdecore/kcalendarsystemgregorian.cpp:113 kdecore/klocale.cpp:564
+#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/klocale.cpp:564
 msgid ""
 "_: December\n"
 "Dec"
 msgstr "Rhag"
 
-#: kdecore/kcalendarsystemgregorian.cpp:119 kdecore/klocale.cpp:569
+#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/klocale.cpp:569
 msgid "January"
 msgstr "Ionawr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:121 kdecore/klocale.cpp:570
+#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/klocale.cpp:570
 msgid "February"
 msgstr "Chwefror"
 
-#: kdecore/kcalendarsystemgregorian.cpp:123 kdecore/klocale.cpp:571
+#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/klocale.cpp:571
 msgid "March"
 msgstr "Mawrth"
 
-#: kdecore/kcalendarsystemgregorian.cpp:125 kdecore/klocale.cpp:572
+#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/klocale.cpp:572
 msgid "April"
 msgstr "Ebrill"
 
-#: kdecore/kcalendarsystemgregorian.cpp:127 kdecore/klocale.cpp:573
+#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/klocale.cpp:573
 msgid ""
 "_: May long\n"
 "May"
 msgstr "Mai"
 
-#: kdecore/kcalendarsystemgregorian.cpp:129 kdecore/klocale.cpp:574
+#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/klocale.cpp:574
 msgid "June"
 msgstr "Mehefin"
 
-#: kdecore/kcalendarsystemgregorian.cpp:131 kdecore/klocale.cpp:575
+#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/klocale.cpp:575
 msgid "July"
 msgstr "Gorfennaf"
 
-#: kdecore/kcalendarsystemgregorian.cpp:133 kdecore/klocale.cpp:576
+#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/klocale.cpp:576
 msgid "August"
 msgstr "Awst"
 
-#: kdecore/kcalendarsystemgregorian.cpp:135 kdecore/klocale.cpp:577
+#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/klocale.cpp:577
 msgid "September"
 msgstr "Medi"
 
-#: kdecore/kcalendarsystemgregorian.cpp:137 kdecore/klocale.cpp:578
+#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/klocale.cpp:578
 msgid "October"
 msgstr "Hydref"
 
-#: kdecore/kcalendarsystemgregorian.cpp:139 kdecore/klocale.cpp:579
+#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/klocale.cpp:579
 msgid "November"
 msgstr "Tachwedd"
 
-#: kdecore/kcalendarsystemgregorian.cpp:141 kdecore/klocale.cpp:580
+#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/klocale.cpp:580
 msgid "December"
 msgstr "Rhagfyr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:156 kdecore/klocale.cpp:591
+#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/klocale.cpp:591
 msgid ""
 "_: of January\n"
 "of Jan"
 msgstr "o Ionawr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:158 kdecore/klocale.cpp:592
+#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/klocale.cpp:592
 msgid ""
 "_: of February\n"
 "of Feb"
 msgstr "o Chwefror"
 
-#: kdecore/kcalendarsystemgregorian.cpp:160 kdecore/klocale.cpp:593
+#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/klocale.cpp:593
 msgid ""
 "_: of March\n"
 "of Mar"
 msgstr "o Fawrth"
 
-#: kdecore/kcalendarsystemgregorian.cpp:162 kdecore/klocale.cpp:594
+#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/klocale.cpp:594
 msgid ""
 "_: of April\n"
 "of Apr"
 msgstr "o Ebrill"
 
-#: kdecore/kcalendarsystemgregorian.cpp:164 kdecore/klocale.cpp:595
+#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/klocale.cpp:595
 msgid ""
 "_: of May short\n"
 "of May"
 msgstr "o Fai"
 
-#: kdecore/kcalendarsystemgregorian.cpp:166 kdecore/klocale.cpp:596
+#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/klocale.cpp:596
 msgid ""
 "_: of June\n"
 "of Jun"
 msgstr "o Fehefin"
 
-#: kdecore/kcalendarsystemgregorian.cpp:168 kdecore/klocale.cpp:597
+#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/klocale.cpp:597
 msgid ""
 "_: of July\n"
 "of Jul"
 msgstr "o Orfennaf"
 
-#: kdecore/kcalendarsystemgregorian.cpp:170 kdecore/klocale.cpp:598
+#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/klocale.cpp:598
 msgid ""
 "_: of August\n"
 "of Aug"
 msgstr "o Awst"
 
-#: kdecore/kcalendarsystemgregorian.cpp:172 kdecore/klocale.cpp:599
+#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/klocale.cpp:599
 msgid ""
 "_: of September\n"
 "of Sep"
 msgstr "o Fedi"
 
-#: kdecore/kcalendarsystemgregorian.cpp:174 kdecore/klocale.cpp:600
+#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/klocale.cpp:600
 msgid ""
 "_: of October\n"
 "of Oct"
 msgstr "o Hydref"
 
-#: kdecore/kcalendarsystemgregorian.cpp:176 kdecore/klocale.cpp:601
+#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/klocale.cpp:601
 msgid ""
 "_: of November\n"
 "of Nov"
 msgstr "o Dachwedd"
 
-#: kdecore/kcalendarsystemgregorian.cpp:178 kdecore/klocale.cpp:602
+#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/klocale.cpp:602
 msgid ""
 "_: of December\n"
 "of Dec"
 msgstr "o Ragfyr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:184 kdecore/klocale.cpp:607
+#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/klocale.cpp:607
 msgid "of January"
 msgstr "o Ionawr"
 
-#: kdecore/kcalendarsystemgregorian.cpp:186 kdecore/klocale.cpp:608
+#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/klocale.cpp:608
 msgid "of February"
 msgstr "o Chwefror"
 
-#: kdecore/kcalendarsystemgregorian.cpp:188 kdecore/klocale.cpp:609
+#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/klocale.cpp:609
 msgid "of March"
 msgstr "o Fawrth"
 
-#: kdecore/kcalendarsystemgregorian.cpp:190 kdecore/klocale.cpp:610
+#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/klocale.cpp:610
 msgid "of April"
 msgstr "o Ebrill"
 
-#: kdecore/kcalendarsystemgregorian.cpp:192 kdecore/klocale.cpp:611
+#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/klocale.cpp:611
 msgid ""
 "_: of May long\n"
 "of May"
 msgstr "o Fai"
 
-#: kdecore/kcalendarsystemgregorian.cpp:194 kdecore/klocale.cpp:612
+#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/klocale.cpp:612
 msgid "of June"
 msgstr "o Fehefin"
 
-#: kdecore/kcalendarsystemgregorian.cpp:196 kdecore/klocale.cpp:613
+#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/klocale.cpp:613
 msgid "of July"
 msgstr "o Orfennaf"
 
-#: kdecore/kcalendarsystemgregorian.cpp:198 kdecore/klocale.cpp:614
+#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/klocale.cpp:614
 msgid "of August"
 msgstr "o Awst"
 
-#: kdecore/kcalendarsystemgregorian.cpp:200 kdecore/klocale.cpp:615
+#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/klocale.cpp:615
 msgid "of September"
 msgstr "o Fedi"
 
-#: kdecore/kcalendarsystemgregorian.cpp:202 kdecore/klocale.cpp:616
+#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/klocale.cpp:616
 msgid "of October"
 msgstr "o Hydref"
 
-#: kdecore/kcalendarsystemgregorian.cpp:204 kdecore/klocale.cpp:617
+#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/klocale.cpp:617
 msgid "of November"
 msgstr "o Dachwedd"
 
-#: kdecore/kcalendarsystemgregorian.cpp:206 kdecore/klocale.cpp:618
+#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/klocale.cpp:618
 msgid "of December"
 msgstr "o Ragfyr"
 
-#: kdecore/klocale.cpp:1773 kdecore/klocale.cpp:1913
+#: tdecore/klocale.cpp:1773 tdecore/klocale.cpp:1913
 msgid "pm"
 msgstr "yp"
 
-#: kdecore/klocale.cpp:1782 kdecore/klocale.cpp:1915
+#: tdecore/klocale.cpp:1782 tdecore/klocale.cpp:1915
 msgid "am"
 msgstr "yb"
 
-#: 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 "&Nesaf"
 
-#: kdecore/netsupp.cpp:890 kdecore/network/kresolver.cpp:557
+#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
 msgid "no error"
 msgstr "dim gwall"
 
-#: kdecore/netsupp.cpp:891
+#: tdecore/netsupp.cpp:891
 msgid "address family for nodename not supported"
 msgstr "ni chynhalir y teulu cyfeiriad am yr enw nôd"
 
-#: 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 "methiant dros dro wrth ddadansoddi'r enw"
 
-#: kdecore/netsupp.cpp:893
+#: tdecore/netsupp.cpp:893
 msgid "invalid value for 'ai_flags'"
 msgstr "gwerth dilys am '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 "methiant anadferadwy wrth ddadansoddi'r enw"
 
-#: kdecore/netsupp.cpp:895
+#: tdecore/netsupp.cpp:895
 msgid "'ai_family' not supported"
 msgstr "ni chynhelir '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 "methiant wrth ddyrannu cof"
 
-#: kdecore/netsupp.cpp:897
+#: tdecore/netsupp.cpp:897
 msgid "no address associated with nodename"
 msgstr "ni chysylltir cyfeiriad efo enw'r nôd"
 
-#: 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 "ni adnabyddir enw neu gwasanaeth"
 
-#: kdecore/netsupp.cpp:899
+#: tdecore/netsupp.cpp:899
 msgid "servname not supported for ai_socktype"
 msgstr "ni chynhelir servname am ai_socktype"
 
-#: kdecore/netsupp.cpp:900
+#: tdecore/netsupp.cpp:900
 msgid "'ai_socktype' not supported"
 msgstr "ni chynhelir 'ai_socktype'"
 
-#: kdecore/netsupp.cpp:901
+#: tdecore/netsupp.cpp:901
 msgid "system error"
 msgstr "gwall cysawd"
 
-#: 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 "Yn ôl"
 
-#: 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 "PriflythGlo"
 
-#: kdecore/kkeyserver_x11.cpp:122
+#: tdecore/kkeyserver_x11.cpp:122
 msgid "NumLock"
 msgstr "RhifGlo"
 
-#: kdecore/kkeyserver_x11.cpp:123
+#: tdecore/kkeyserver_x11.cpp:123
 msgid "ScrollLock"
 msgstr "SgrolGlo"
 
-#: kdecore/kkeyserver_x11.cpp:124
+#: tdecore/kkeyserver_x11.cpp:124
 msgid "PageUp"
 msgstr "Tudalen i Fyny"
 
-#: kdecore/kkeyserver_x11.cpp:125
+#: tdecore/kkeyserver_x11.cpp:125
 msgid "PageDown"
 msgstr "Tudalen i Lawr"
 
-#: kdecore/kkeyserver_x11.cpp:128
+#: tdecore/kkeyserver_x11.cpp:128
 msgid "Again"
 msgstr "Eto"
 
-#: kdecore/kkeyserver_x11.cpp:129
+#: tdecore/kkeyserver_x11.cpp:129
 msgid "Props"
 msgstr "Ategion"
 
-#: kdecore/kkeyserver_x11.cpp:131
+#: tdecore/kkeyserver_x11.cpp:131
 msgid "Front"
 msgstr "Ffront"
 
-#: kdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
+#: tdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
 msgid "Arabic"
 msgstr "Arabaidd"
 
-#: kdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
+#: tdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
 msgid "Baltic"
 msgstr "Baltig"
 
-#: kdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
+#: tdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
 msgid "Central European"
 msgstr "Canol Ewrop"
 
-#: kdecore/kcharsets.cpp:47
+#: tdecore/kcharsets.cpp:47
 msgid "Chinese Simplified"
 msgstr "Tseineeg Syml"
 
-#: kdecore/kcharsets.cpp:48
+#: tdecore/kcharsets.cpp:48
 msgid "Chinese Traditional"
 msgstr "Tsieineeg Traddodiadol"
 
-#: kdecore/kcharsets.cpp:49
+#: tdecore/kcharsets.cpp:49
 msgid "Cyrillic"
 msgstr "Cyrilig"
 
-#: kdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
+#: tdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
 msgid "Greek"
 msgstr "Groeg"
 
-#: 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 "Hebraeg"
 
-#: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
+#: tdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
 msgid "Japanese"
 msgstr "Siapaneeg"
 
-#: kdecore/kcharsets.cpp:53
+#: tdecore/kcharsets.cpp:53
 msgid "Korean"
 msgstr "Coreeg"
 
-#: kdecore/kcharsets.cpp:54
+#: tdecore/kcharsets.cpp:54
 msgid "Thai"
 msgstr "Taieg"
 
-#: 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 "Twrceg"
 
-#: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
+#: tdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
 msgid "Western European"
 msgstr "Gorllewin Ewrop"
 
-#: kdecore/kcharsets.cpp:57
+#: tdecore/kcharsets.cpp:57
 msgid "Tamil"
 msgstr "Tamileg"
 
-#: kdecore/kcharsets.cpp:58
+#: tdecore/kcharsets.cpp:58
 msgid "Unicode"
 msgstr "Unicôd"
 
-#: kdecore/kcharsets.cpp:59
+#: tdecore/kcharsets.cpp:59
 msgid "Northern Saami"
 msgstr "Saami Gogleddol"
 
-#: kdecore/kcharsets.cpp:60
+#: tdecore/kcharsets.cpp:60
 msgid "Vietnamese"
 msgstr "Fietnamaidd"
 
-#: kdecore/kcharsets.cpp:61
+#: tdecore/kcharsets.cpp:61
 #, fuzzy
 msgid "South-Eastern Europe"
 msgstr "Gorllewin Ewrop"
 
-#: 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 "Sbwriel"
 
-#: kdecore/kcompletion.cpp:632
+#: tdecore/kcompletion.cpp:632
 msgid ""
 "You reached the end of the list\n"
 "of matching items.\n"
@@ -4156,7 +4156,7 @@ msgstr ""
 " Rydych wedi cyrraedd diwedd y rhestr\n"
 " o dermau cydweddol.\n"
 
-#: kdecore/kcompletion.cpp:638
+#: tdecore/kcompletion.cpp:638
 msgid ""
 "The completion is ambiguous, more than one\n"
 "match is available.\n"
@@ -4164,69 +4164,69 @@ msgstr ""
 "Mae'r cwblhâd yn amwys, mae mwy nac un \n"
 " cydweddiad ar gael\n"
 
-#: kdecore/kcompletion.cpp:644
+#: tdecore/kcompletion.cpp:644
 msgid ""
 "There is no matching item available.\n"
 msgstr ""
 "Dim cydweddiad ar gael.\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
 #, fuzzy
 msgid ""
 "_: replace this with information about your translation team\n"
@@ -4241,7 +4241,7 @@ msgstr ""
 "http://i18n.kde.org.</p>Am ragor o wybodaeth ar KDE a meddalwedd rhydd yn "
 "Gymraeg, ewch i http://www.kyfieithu.co.uk</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"
@@ -4251,213 +4251,213 @@ msgstr ""
 "Gwiriwch y ddogfeniaeth neu'r côd am unrhyw dermau \n"
 "trwyddedu.\n"
 
-#: kdecore/kaboutdata.cpp:451
+#: tdecore/kaboutdata.cpp:451
 #, c-format
 msgid "This program is distributed under the terms of the %1."
 msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
 
-#: kdecore/kcalendarsystem.cpp:124
+#: tdecore/kcalendarsystem.cpp:124
 msgid ""
 "_: Monday\n"
 "Mon"
 msgstr "Llun"
 
-#: kdecore/kcalendarsystem.cpp:125
+#: tdecore/kcalendarsystem.cpp:125
 msgid ""
 "_: Tuesday\n"
 "Tue"
 msgstr "Maw"
 
-#: kdecore/kcalendarsystem.cpp:126
+#: tdecore/kcalendarsystem.cpp:126
 msgid ""
 "_: Wednesday\n"
 "Wed"
 msgstr "Mer"
 
-#: kdecore/kcalendarsystem.cpp:127
+#: tdecore/kcalendarsystem.cpp:127
 msgid ""
 "_: Thursday\n"
 "Thu"
 msgstr "Iau"
 
-#: kdecore/kcalendarsystem.cpp:128
+#: tdecore/kcalendarsystem.cpp:128
 msgid ""
 "_: Friday\n"
 "Fri"
 msgstr "Gwe"
 
-#: kdecore/kcalendarsystem.cpp:129
+#: tdecore/kcalendarsystem.cpp:129
 msgid ""
 "_: Saturday\n"
 "Sat"
 msgstr "Sad"
 
-#: kdecore/kcalendarsystem.cpp:130
+#: tdecore/kcalendarsystem.cpp:130
 msgid ""
 "_: Sunday\n"
 "Sun"
 msgstr "Sul"
 
-#: kdecore/ksocks.cpp:135
+#: tdecore/ksocks.cpp:135
 msgid "NEC SOCKS client"
 msgstr "dibynnydd NEC SOCKS"
 
-#: kdecore/ksocks.cpp:170
+#: tdecore/ksocks.cpp:170
 msgid "Dante SOCKS client"
 msgstr "dibynnydd Dante SOCKS"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:45
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:45
 msgid "Directory to generate files in"
 msgstr "Cyfeiriadur i greu ffeiliau ynddo"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:46
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:46
 msgid "Input kcfg XML file"
 msgstr "Mewnosod ffeil XML kcfg"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:47
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:47
 msgid "Code generation options file"
 msgstr "Ffeil ddewisiadau am greu côd"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:955
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:955
 msgid "KDE .kcfg compiler"
 msgstr "Crynhoydd .kcfg KDE"
 
-#: kdecore/kconfig_compiler/kconfig_compiler.cpp:956
+#: tdecore/kconfig_compiler/kconfig_compiler.cpp:956
 msgid "KConfig Compiler"
 msgstr "Crynhoydd KConfig"
 
-#: kdecore/network/kresolver.cpp:558
+#: tdecore/network/kresolver.cpp:558
 msgid "requested family not supported for this host name"
 msgstr "ni chynhelir y deulu benodol i'r enw gwesteiwr yma"
 
-#: kdecore/network/kresolver.cpp:561
+#: tdecore/network/kresolver.cpp:561
 msgid "invalid flags"
 msgstr "baneri annilys"
 
-#: kdecore/network/kresolver.cpp:564
+#: tdecore/network/kresolver.cpp:564
 msgid "requested family not supported"
 msgstr "ni chynhelir deulu benodol"
 
-#: kdecore/network/kresolver.cpp:565
+#: tdecore/network/kresolver.cpp:565
 msgid "requested service not supported for this socket type"
 msgstr "ni chynhelir y gwasanaeth benodol am y math yma o soced"
 
-#: kdecore/network/kresolver.cpp:566
+#: tdecore/network/kresolver.cpp:566
 msgid "requested socket type not supported"
 msgstr "ni chynhelir y math penodol o soced"
 
-#: kdecore/network/kresolver.cpp:567
+#: tdecore/network/kresolver.cpp:567
 msgid "unknown error"
 msgstr "gwall anhysbys"
 
-#: 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 "gwall cysawd : %1"
 
-#: kdecore/network/kresolver.cpp:574
+#: tdecore/network/kresolver.cpp:574
 msgid "request was canceled"
 msgstr "diddymwyd y cais"
 
-#: kdecore/network/ksocketbase.cpp:172
+#: tdecore/network/ksocketbase.cpp:172
 msgid ""
 "_: Socket error code NoError\n"
 "no error"
 msgstr "dim gwall"
 
-#: kdecore/network/ksocketbase.cpp:177
+#: tdecore/network/ksocketbase.cpp:177
 msgid ""
 "_: Socket error code LookupFailure\n"
 "name lookup has failed"
 msgstr "methodd chwilio'r enw"
 
-#: kdecore/network/ksocketbase.cpp:182
+#: tdecore/network/ksocketbase.cpp:182
 msgid ""
 "_: Socket error code AddressInUse\n"
 "address already in use"
 msgstr "mae'r cyfeiriad mewn defnydd eisoes"
 
-#: kdecore/network/ksocketbase.cpp:187
+#: tdecore/network/ksocketbase.cpp:187
 msgid ""
 "_: Socket error code AlreadyBound\n"
 "socket is already bound"
 msgstr "mae'r soced wedi'i rhwymo eisoes"
 
-#: kdecore/network/ksocketbase.cpp:192
+#: tdecore/network/ksocketbase.cpp:192
 msgid ""
 "_: Socket error code AlreadyCreated\n"
 "socket is already created"
 msgstr "mae'r soced wedi'i greu eisoes"
 
-#: kdecore/network/ksocketbase.cpp:197
+#: tdecore/network/ksocketbase.cpp:197
 msgid ""
 "_: Socket error code NotBound\n"
 "socket is not bound"
 msgstr "ni rhwymir y soced"
 
-#: kdecore/network/ksocketbase.cpp:202
+#: tdecore/network/ksocketbase.cpp:202
 msgid ""
 "_: Socket error code NotCreated\n"
 "socket has not been created"
 msgstr "ni chreuwyd y soced"
 
-#: kdecore/network/ksocketbase.cpp:207
+#: tdecore/network/ksocketbase.cpp:207
 msgid ""
 "_: Socket error code WouldBlock\n"
 "operation would block"
 msgstr "bydd y gweithrediad yn rhwystro"
 
-#: kdecore/network/ksocketbase.cpp:212
+#: tdecore/network/ksocketbase.cpp:212
 msgid ""
 "_: Socket error code ConnectionRefused\n"
 "connection actively refused"
 msgstr "gwrthodwyd y cysyltiad yn weithredol"
 
-#: kdecore/network/ksocketbase.cpp:217
+#: tdecore/network/ksocketbase.cpp:217
 msgid ""
 "_: Socket error code ConnectionTimedOut\n"
 "connection timed out"
 msgstr "mae'r cysylltiad wedi goramseru"
 
-#: kdecore/network/ksocketbase.cpp:222
+#: tdecore/network/ksocketbase.cpp:222
 msgid ""
 "_: Socket error code InProgress\n"
 "operation is already in progress"
 msgstr "mae'r gweithrediad ar y gweill eisoes"
 
-#: kdecore/network/ksocketbase.cpp:227
+#: tdecore/network/ksocketbase.cpp:227
 msgid ""
 "_: Socket error code NetFailure\n"
 "network failure occurred"
 msgstr "methodd y rhwydwaith"
 
-#: kdecore/network/ksocketbase.cpp:232
+#: tdecore/network/ksocketbase.cpp:232
 msgid ""
 "_: Socket error code NotSupported\n"
 "operation is not supported"
 msgstr "ni chynhelir y gweithrediad "
 
-#: kdecore/network/ksocketbase.cpp:237
+#: tdecore/network/ksocketbase.cpp:237
 msgid ""
 "_: Socket error code Timeout\n"
 "timed operation timed out"
 msgstr "mae gweithrediad amseredig wedi goramseru"
 
-#: kdecore/network/ksocketbase.cpp:242
+#: tdecore/network/ksocketbase.cpp:242
 msgid ""
 "_: Socket error code UnknownError\n"
 "an unknown/unexpected error has happened"
 msgstr "digwyddodd gwall anhysbys/annisgwyl"
 
-#: kdecore/network/ksocketbase.cpp:247
+#: tdecore/network/ksocketbase.cpp:247
 msgid ""
 "_: Socket error code RemotelyDisconnected\n"
 "remote host closed connection"
 msgstr "caeodd y gwesteiwr pell y cysylltiad"
 
-#: kdecore/network/ksocketaddress.cpp:625
+#: tdecore/network/ksocketaddress.cpp:625
 #, c-format
 msgid ""
 "_: 1: the unknown socket address family number\n"
@@ -4468,7 +4468,7 @@ msgstr ""
 msgid "Share Hot New Stuff"
 msgstr "Rhannu y Diweddaraf"
 
-#: kdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
+#: tdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
 #: kresources/configdialog.cpp:53
 msgid "Name:"
 msgstr "Enw:"
@@ -4482,7 +4482,7 @@ msgstr "Awdur:"
 msgid "Email:"
 msgstr "Ebost"
 
-#: kdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
+#: tdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
 msgid "Version:"
 msgstr "Fersiwn :"
 
@@ -4589,7 +4589,7 @@ msgstr "Dyddiad Rhyddháu"
 msgid "Install"
 msgstr "Arsefydlu"
 
-#: kdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
+#: tdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
 #: knewstuff/downloaddialog.cpp:505
 msgid "Details"
 msgstr " Manylion"
@@ -4852,15 +4852,15 @@ msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
 msgid "No provider selected."
 msgstr "Nid oes darparwr wedi ei dewis."
 
-#: kdeui/kkeydialog.cpp:321
+#: tdeui/kkeydialog.cpp:321
 msgid "Clear Search"
 msgstr "Gwagu'r Chwiliad"
 
-#: kdeui/kkeydialog.cpp:324
+#: tdeui/kkeydialog.cpp:324
 msgid "&Search:"
 msgstr "&Chwilio:"
 
-#: 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."
@@ -4868,7 +4868,7 @@ msgstr ""
 "Chwilio yn rhyngweithiol ar gyfer enwau byrlwybrau (e.e. Copïo) neu cyfuniad o "
 "fysellau (e.e. Ctrl+C) gan eu teipio yma."
 
-#: 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. "
@@ -4878,39 +4878,39 @@ msgstr ""
 "(e.e.'Copi') sy'n ymddangos yn y golofn chwith a bysellau neu cyfuniad o "
 "fysellau (e.e. Ctrl+V) sy'n ymddangos yn y golofn dde."
 
-#: kdeui/kkeydialog.cpp:363
+#: tdeui/kkeydialog.cpp:363
 msgid "Action"
 msgstr "Gweithrediad"
 
-#: kdeui/kkeydialog.cpp:364
+#: tdeui/kkeydialog.cpp:364
 msgid "Shortcut"
 msgstr "Byrlwybr"
 
-#: kdeui/kkeydialog.cpp:365
+#: tdeui/kkeydialog.cpp:365
 msgid "Alternate"
 msgstr "Eiledol"
 
-#: kdeui/kkeydialog.cpp:380
+#: tdeui/kkeydialog.cpp:380
 msgid "Shortcut for Selected Action"
 msgstr "Byrlwybr i'r gweithrediad a ddewiswyd"
 
-#: kdeui/kkeydialog.cpp:393
+#: tdeui/kkeydialog.cpp:393
 msgid ""
 "_: no key\n"
 "&None"
 msgstr "&Dim"
 
-#: kdeui/kkeydialog.cpp:398
+#: tdeui/kkeydialog.cpp:398
 msgid "The selected action will not be associated with any key."
 msgstr "Ni chysylltir y gweithrediad a ddewiswyd efo unrhyw bysell."
 
-#: kdeui/kkeydialog.cpp:401
+#: tdeui/kkeydialog.cpp:401
 msgid ""
 "_: default key\n"
 "De&fault"
 msgstr "&Rhagosodol"
 
-#: kdeui/kkeydialog.cpp:406
+#: tdeui/kkeydialog.cpp:406
 msgid ""
 "This will bind the default key to the selected action. Usually a reasonable "
 "choice."
@@ -4918,11 +4918,11 @@ msgstr ""
 "Fe rhwymir y fysell rhagosodol i'r gweithrediad a ddewiswyd. Dewis rhesymol fel "
 "arfer."
 
-#: kdeui/kkeydialog.cpp:409
+#: tdeui/kkeydialog.cpp:409
 msgid "C&ustom"
 msgstr "A&ddasu"
 
-#: 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."
@@ -4930,7 +4930,7 @@ msgstr ""
 "Pan detholir y dewis yma, cewch greu rhwymiad bysell addasol i'r gweithrediad a "
 "ddewiswyd wrth ddefnyddio'r botymau isod."
 
-#: 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 "
@@ -4940,19 +4940,19 @@ msgstr ""
 "cewch wthio'r gyfuniad o fysellau i'w neilltuo i'r gweithrediad a ddewisir ar "
 "hyn o bryd."
 
-#: kdeui/kkeydialog.cpp:470
+#: tdeui/kkeydialog.cpp:470
 msgid "Shortcuts"
 msgstr "Byrlwybrau"
 
-#: kdeui/kkeydialog.cpp:536
+#: tdeui/kkeydialog.cpp:536
 msgid "Default key:"
 msgstr "Bysell rhagosodol:"
 
-#: 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 "Dim"
 
-#: 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."
@@ -4960,11 +4960,11 @@ msgstr ""
 "Er mwyn defnyddio'r fysell '%1' fel byrlwybr, rhaid ei chyfuno efo'r bysellau "
 "Win, Alt, Ctrl, a/neu Shift."
 
-#: kdeui/kkeydialog.cpp:718
+#: tdeui/kkeydialog.cpp:718
 msgid "Invalid Shortcut Key"
 msgstr "Bysell Fyrlwybr Annilys"
 
-#: 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."
@@ -4972,11 +4972,11 @@ msgstr ""
 "Mae cyfuniad bysell %1 wedi ei dyrannu yn barod i'r gweithrediad \"%2\".\n"
 " Dewiswch cyfuniad bysell unigryw."
 
-#: kdeui/kkeydialog.cpp:958
+#: tdeui/kkeydialog.cpp:958
 msgid "Conflict with Standard Application Shortcut"
 msgstr "Croestyniad efo Byrlwybr Cymhwysiad Arferol"
 
-#: kdeui/kkeydialog.cpp:959
+#: tdeui/kkeydialog.cpp:959
 msgid ""
 "The '%1' key combination has already been allocated to the standard action "
 "\"%2\".\n"
@@ -4985,11 +4985,11 @@ msgstr ""
 "Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred safonol \"%2\".\n"
 "Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
 
-#: kdeui/kkeydialog.cpp:964
+#: tdeui/kkeydialog.cpp:964
 msgid "Conflict with Global Shortcut"
 msgstr "Croestyniad efo Byrlwybr Eang"
 
-#: kdeui/kkeydialog.cpp:965
+#: tdeui/kkeydialog.cpp:965
 msgid ""
 "The '%1' key combination has already been allocated to the global action "
 "\"%2\".\n"
@@ -4998,11 +4998,11 @@ msgstr ""
 "Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred eang \"%2\".\n"
 "Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
 
-#: kdeui/kkeydialog.cpp:970
+#: tdeui/kkeydialog.cpp:970
 msgid "Key Conflict"
 msgstr "Croestyniad Bysell"
 
-#: 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?"
@@ -5010,237 +5010,237 @@ msgstr ""
 "Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred \"%2\".\n"
 "Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
 
-#: kdeui/kkeydialog.cpp:977
+#: tdeui/kkeydialog.cpp:977
 #, fuzzy
 msgid "Reassign"
 msgstr "Rwsieg"
 
-#: kdeui/kkeydialog.cpp:1091 kdeui/kkeydialog.cpp:1103
+#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
 msgid "Configure Shortcuts"
 msgstr "Ffurfweddu Byrlwybrau"
 
-#: kdeui/ktabbar.cpp:196
+#: tdeui/ktabbar.cpp:196
 msgid "Close this tab"
 msgstr "Cau'r tab yma"
 
-#: kdeui/kpixmapregionselectordialog.cpp:28
+#: tdeui/kpixmapregionselectordialog.cpp:28
 msgid "Select Region of Image"
 msgstr "Dewis Ardal Delwedd"
 
-#: kdeui/kpixmapregionselectordialog.cpp:31
+#: tdeui/kpixmapregionselectordialog.cpp:31
 msgid "Please click and drag on the image to select the region of interest:"
 msgstr "Cliciwch a llusgo ar y ddelwedd er mwyn dewis yr ardal o ddiddordeb:"
 
-#: kdeui/kswitchlanguagedialog.cpp:90
+#: tdeui/kswitchlanguagedialog.cpp:90
 #, fuzzy
 msgid "Switch application language"
 msgstr "gosod enw'r cymhwysiad"
 
-#: 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
 #, fuzzy
 msgid "Add fallback language"
 msgstr "Iaith rhagosodol:"
 
-#: 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
 #, fuzzy
 msgid "Application language changed"
 msgstr "Cymhwysiad:"
 
-#: kdeui/kswitchlanguagedialog.cpp:282
+#: tdeui/kswitchlanguagedialog.cpp:282
 #, fuzzy
 msgid "Primary language:"
 msgstr "Iaith rhagosodol:"
 
-#: kdeui/kswitchlanguagedialog.cpp:282
+#: tdeui/kswitchlanguagedialog.cpp:282
 #, fuzzy
 msgid "Fallback language:"
 msgstr "Iaith rhagosodol:"
 
-#: 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 "Creu cyfuniadau &gwraidd/at-ddodiad sy ddim yn y geiriadur"
 
-#: kdeui/ksconfig.cpp:107
+#: tdeui/ksconfig.cpp:107
 msgid "Consider run-together &words as spelling errors"
 msgstr "Ystyried geiriau &difwlch fel camgymeriadau sillafu"
 
-#: kdeui/ksconfig.cpp:118
+#: tdeui/ksconfig.cpp:118
 msgid "&Dictionary:"
 msgstr "&Geiriadur:"
 
-#: kdeui/ksconfig.cpp:143
+#: tdeui/ksconfig.cpp:143
 msgid "&Encoding:"
 msgstr "&Amgodiad:"
 
-#: kdeui/ksconfig.cpp:148
+#: tdeui/ksconfig.cpp:148
 msgid "International Ispell"
 msgstr "Ispell Rhyngwladol"
 
-#: 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
 #, fuzzy
 msgid "Zemberek"
 msgstr "Tachwedd"
 
-#: kdeui/ksconfig.cpp:156
+#: tdeui/ksconfig.cpp:156
 msgid "&Client:"
 msgstr "&Dibynnydd:"
 
-#: kdeui/ksconfig.cpp:297
+#: tdeui/ksconfig.cpp:297
 msgid "Spanish"
 msgstr "Sbaeneg"
 
-#: kdeui/ksconfig.cpp:300
+#: tdeui/ksconfig.cpp:300
 msgid "Danish"
 msgstr "Daneg"
 
-#: kdeui/ksconfig.cpp:303
+#: tdeui/ksconfig.cpp:303
 msgid "German"
 msgstr "Almaeneg"
 
-#: kdeui/ksconfig.cpp:306
+#: tdeui/ksconfig.cpp:306
 msgid "German (new spelling)"
 msgstr "Almaeneg (sillafu newydd)"
 
-#: kdeui/ksconfig.cpp:309
+#: tdeui/ksconfig.cpp:309
 msgid "Brazilian Portuguese"
 msgstr "Portiwgaleg o Frasil"
 
-#: kdeui/ksconfig.cpp:312
+#: tdeui/ksconfig.cpp:312
 msgid "Portuguese"
 msgstr "Portiwgaleg"
 
-#: kdeui/ksconfig.cpp:315
+#: tdeui/ksconfig.cpp:315
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: kdeui/ksconfig.cpp:318
+#: tdeui/ksconfig.cpp:318
 msgid "Norwegian"
 msgstr "Norwyeg"
 
-#: kdeui/ksconfig.cpp:321
+#: tdeui/ksconfig.cpp:321
 msgid "Polish"
 msgstr "Pwyleg"
 
-#: kdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
+#: tdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: kdeui/ksconfig.cpp:327
+#: tdeui/ksconfig.cpp:327
 msgid "Slovenian"
 msgstr "Slofeneg"
 
-#: kdeui/ksconfig.cpp:330
+#: tdeui/ksconfig.cpp:330
 msgid "Slovak"
 msgstr "Slofaceg"
 
-#: kdeui/ksconfig.cpp:333
+#: tdeui/ksconfig.cpp:333
 msgid "Czech"
 msgstr "Tsieceg"
 
-#: kdeui/ksconfig.cpp:336
+#: tdeui/ksconfig.cpp:336
 msgid "Swedish"
 msgstr "Swedeg"
 
-#: kdeui/ksconfig.cpp:339
+#: tdeui/ksconfig.cpp:339
 msgid "Swiss German"
 msgstr "Almaeneg y Swistir"
 
-#: kdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
+#: tdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
 msgid "Ukrainian"
 msgstr "Wcraneg"
 
-#: kdeui/ksconfig.cpp:345
+#: tdeui/ksconfig.cpp:345
 msgid "Lithuanian"
 msgstr "Lithuaneg"
 
-#: kdeui/ksconfig.cpp:348
+#: tdeui/ksconfig.cpp:348
 msgid "French"
 msgstr "Ffrangeg"
 
-#: kdeui/ksconfig.cpp:351
+#: tdeui/ksconfig.cpp:351
 msgid "Belarusian"
 msgstr "Belarwsieg"
 
-#: kdeui/ksconfig.cpp:354
+#: tdeui/ksconfig.cpp:354
 msgid "Hungarian"
 msgstr "Hwngareg"
 
-#: kdeui/ksconfig.cpp:358
+#: tdeui/ksconfig.cpp:358
 msgid ""
 "_: Unknown ispell dictionary\n"
 "Unknown"
 msgstr "Anhysbys"
 
-#: kdeui/ksconfig.cpp:440 kdeui/ksconfig.cpp:594
+#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
 msgid "ISpell Default"
 msgstr "Rhagosodiad 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 " Rhagosodiad - %1 [%2]"
 
-#: kdeui/ksconfig.cpp:508 kdeui/ksconfig.cpp:668
+#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
 msgid "ASpell Default"
 msgstr "Rhagosodiad 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 "Rhagosodiad - %1"
 
-#: kdeui/kfontrequester.cpp:38
+#: tdeui/kfontrequester.cpp:38
 msgid "Choose..."
 msgstr "Dewis..."
 
-#: kdeui/kfontrequester.cpp:102
+#: tdeui/kfontrequester.cpp:102
 msgid "Click to select a font"
 msgstr "Cliciwch i ddewis wynebfath"
 
-#: kdeui/kfontrequester.cpp:109
+#: tdeui/kfontrequester.cpp:109
 msgid "Preview of the selected font"
 msgstr "Rhagolwg y r wynebfath penodol"
 
-#: 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."
@@ -5248,11 +5248,11 @@ msgstr ""
 "Mae hyn yn rhagolwg yr wynebfath penodol.  Cewch ei newid gan glicio'r botwm "
 "\"Dewis...\"."
 
-#: kdeui/kfontrequester.cpp:117
+#: tdeui/kfontrequester.cpp:117
 msgid "Preview of the \"%1\" font"
 msgstr "Rhagolwg y font \"%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."
@@ -5261,11 +5261,11 @@ msgstr ""
 "\"Dewis...\"."
 
 #. 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."
@@ -5273,15 +5273,15 @@ msgstr ""
 "Dim gwybodaeth ar gael. \n"
 " Nid ydy'r gwrthrych KAboutData a ddarparwyd ddim yn bodoli."
 
-#: kdeui/kaboutapplication.cpp:107
+#: tdeui/kaboutapplication.cpp:107
 msgid "A&uthor"
 msgstr "A&wdur"
 
-#: kdeui/kaboutapplication.cpp:107
+#: tdeui/kaboutapplication.cpp:107
 msgid "A&uthors"
 msgstr "A&wduron"
 
-#: kdeui/kaboutapplication.cpp:117
+#: tdeui/kaboutapplication.cpp:117
 #, fuzzy
 msgid ""
 "Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
@@ -5290,7 +5290,7 @@ msgstr ""
 "Defnyddiwch <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
 "er mwyn adrodd namau; peidiwch ac anfon ebost i'r awduron yn uniongyrchol."
 
-#: kdeui/kaboutapplication.cpp:121 kdeui/kaboutapplication.cpp:124
+#: tdeui/kaboutapplication.cpp:121 tdeui/kaboutapplication.cpp:124
 #, fuzzy
 msgid ""
 "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
@@ -5298,106 +5298,106 @@ msgstr ""
 "Defnyddiwch <a href=\"mailto:%1\">%1</a> er mwyn adrodd namau; peidiwch ac "
 "anfon ebost i'r awduron yn uniongyrchol.\n"
 
-#: kdeui/kaboutapplication.cpp:149
+#: tdeui/kaboutapplication.cpp:149
 msgid "&Thanks To"
 msgstr "&Diolch i"
 
-#: kdeui/kaboutapplication.cpp:176
+#: tdeui/kaboutapplication.cpp:176
 msgid "T&ranslation"
 msgstr "C&yfieithiad"
 
-#: kdeui/kaboutapplication.cpp:181
+#: tdeui/kaboutapplication.cpp:181
 msgid "&License Agreement"
 msgstr "Cytundeb &Trwydded"
 
-#: kdeui/kfontdialog.cpp:101
+#: tdeui/kfontdialog.cpp:101
 msgid "Here you can choose the font to be used."
 msgstr "Yma y dewisir yr wynebfath a ddefnyddir."
 
-#: kdeui/kfontdialog.cpp:113
+#: tdeui/kfontdialog.cpp:113
 msgid "Requested Font"
 msgstr "Wynebfath a Ddymunwyd"
 
-#: kdeui/kfontdialog.cpp:136
+#: tdeui/kfontdialog.cpp:136
 msgid "Change font family?"
 msgstr "Newid y teulu wynebfath?"
 
-#: kdeui/kfontdialog.cpp:138
+#: tdeui/kfontdialog.cpp:138
 msgid "Enable this checkbox to change the font family settings."
 msgstr "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r teulu wynebfath."
 
-#: kdeui/kcharselect.cpp:383 kdeui/kfontdialog.cpp:144
+#: tdeui/kcharselect.cpp:383 tdeui/kfontdialog.cpp:144
 msgid "Font:"
 msgstr "Wynebfath:"
 
-#: kdeui/kfontdialog.cpp:151
+#: tdeui/kfontdialog.cpp:151
 msgid "Font style"
 msgstr "Ardull wynebfath"
 
-#: kdeui/kfontdialog.cpp:155
+#: tdeui/kfontdialog.cpp:155
 msgid "Change font style?"
 msgstr "Newid ardull wynebfath?"
 
-#: kdeui/kfontdialog.cpp:157
+#: tdeui/kfontdialog.cpp:157
 msgid "Enable this checkbox to change the font style settings."
 msgstr ""
 "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r arddull wynebfath."
 
-#: kdeui/kfontdialog.cpp:163
+#: tdeui/kfontdialog.cpp:163
 msgid "Font style:"
 msgstr "Ardull wynebfath:"
 
-#: kdeui/kfontdialog.cpp:171
+#: tdeui/kfontdialog.cpp:171
 msgid "Size"
 msgstr "Maint"
 
-#: kdeui/kfontdialog.cpp:175
+#: tdeui/kfontdialog.cpp:175
 msgid "Change font size?"
 msgstr "Newid maint yr wynebfath?"
 
-#: kdeui/kfontdialog.cpp:177
+#: tdeui/kfontdialog.cpp:177
 msgid "Enable this checkbox to change the font size settings."
 msgstr ""
 "Alluogi'r blwch britho yma er mwyn newid gosodiadau maint yr wynebfath."
 
-#: kdeui/kfontdialog.cpp:183
+#: tdeui/kfontdialog.cpp:183
 msgid "Size:"
 msgstr "Maint:"
 
-#: kdeui/kfontdialog.cpp:199
+#: tdeui/kfontdialog.cpp:199
 msgid "Here you can choose the font family to be used."
 msgstr "Yma y dewisir y teulu wynebfath a ddefnyddir."
 
-#: kdeui/kfontdialog.cpp:221
+#: tdeui/kfontdialog.cpp:221
 msgid "Here you can choose the font style to be used."
 msgstr "Yma y dewisir yr arddull wynebfath a ddefnyddir."
 
-#: 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 "Cyffredin"
 
-#: kdeui/kfontdialog.cpp:226
+#: tdeui/kfontdialog.cpp:226
 msgid "Bold"
 msgstr "Trwm"
 
-#: kdeui/kfontdialog.cpp:227
+#: tdeui/kfontdialog.cpp:227
 msgid "Bold Italic"
 msgstr "Trwm Italig"
 
-#: kdeui/kfontdialog.cpp:244
+#: tdeui/kfontdialog.cpp:244
 msgid "Relative"
 msgstr " Cymharol"
 
-#: kdeui/kfontdialog.cpp:246
+#: tdeui/kfontdialog.cpp:246
 msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
 msgstr ""
 "Mae maint yr wynebfath yn "
 "<br><i>osodedig</i> neu <i>gymharol</i>"
 "<br> i'r amgylchedd"
 
-#: 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 "
@@ -5407,16 +5407,16 @@ msgstr ""
 "chyfrifir yn ddinamig ac a  addasir i amgychedd sy'n newid (e.e. dimensiynau'r "
 "celfigyn, maint y papur)."
 
-#: kdeui/kfontdialog.cpp:272
+#: tdeui/kfontdialog.cpp:272
 msgid "Here you can choose the font size to be used."
 msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
 
 #. 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 "Duw a'm gwaredo, ni allaf ddianc rhag hon"
 
-#: kdeui/kfontdialog.cpp:301
+#: tdeui/kfontdialog.cpp:301
 msgid ""
 "This sample text illustrates the current settings. You may edit it to test "
 "special characters."
@@ -5424,19 +5424,19 @@ msgstr ""
 "Mae'r testun engraifft yma yn dangos y gosodiadau cyfredol. Cewch ei golygu er "
 "mwyn arbrofi llythrennau arbennig."
 
-#: kdeui/kfontdialog.cpp:310 kdeui/kfontdialog.cpp:320
+#: tdeui/kfontdialog.cpp:310 tdeui/kfontdialog.cpp:320
 msgid "Actual Font"
 msgstr "Gwir Wynebfath"
 
-#: kdeui/kactionselector.cpp:69
+#: tdeui/kactionselector.cpp:69
 msgid "&Available:"
 msgstr "&Ar gael:"
 
-#: kdeui/kactionselector.cpp:84
+#: tdeui/kactionselector.cpp:84
 msgid "&Selected:"
 msgstr "&Wedi'u dewis:"
 
-#: kdeui/kcharselect.cpp:366
+#: tdeui/kcharselect.cpp:366
 msgid ""
 "_: Character\n"
 "<qt><font size=\"+4\" face=\"%1\">%2</font>"
@@ -5449,51 +5449,51 @@ msgstr ""
 "<br>(Mewn degolion: %4)"
 "<br>(Nod: %5)</qt>"
 
-#: kdeui/kcharselect.cpp:394
+#: tdeui/kcharselect.cpp:394
 msgid "Table:"
 msgstr "Tabl:"
 
-#: kdeui/kcharselect.cpp:404
+#: tdeui/kcharselect.cpp:404
 msgid "&Unicode code point:"
 msgstr "Pwynt nod &Unicode:"
 
-#: kdeui/kmessagebox.cpp:428 kdeui/kmessagebox.cpp:479
+#: tdeui/kmessagebox.cpp:428 tdeui/kmessagebox.cpp:479
 msgid "Question"
 msgstr "Cwestiwn"
 
-#: 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 "Peidiwch a gofyn eto"
 
-#: 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 "Ynglyn â %1"
 
-#: kdeui/klineedit.cpp:890
+#: tdeui/klineedit.cpp:890
 msgid "Manual"
 msgstr "Llawlyfr"
 
-#: kdeui/klineedit.cpp:891
+#: tdeui/klineedit.cpp:891
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: kdeui/klineedit.cpp:892
+#: tdeui/klineedit.cpp:892
 msgid "Dropdown List"
 msgstr "Rhestr Cwymplen"
 
-#: kdeui/klineedit.cpp:893
+#: tdeui/klineedit.cpp:893
 msgid "Short Automatic"
 msgstr "Awtomatig Byr"
 
-#: kdeui/klineedit.cpp:894
+#: tdeui/klineedit.cpp:894
 msgid "Dropdown List && Automatic"
 msgstr "Rhestr Cwymplen && Ymysgogol"
 
-#: kdeui/kaboutkde.cpp:34
+#: tdeui/kaboutkde.cpp:34
 #, fuzzy
 msgid ""
 "The <b>K Desktop Environment</b> is written and maintained by the KDE Team, a "
@@ -5517,7 +5517,7 @@ msgstr ""
 "<br>Ewch i <A HREF=\"http://www.kde.org/\">http://www.kde.org</A>"
 "am fwy o fanylion am y cywaith KDE."
 
-#: 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 "
@@ -5544,7 +5544,7 @@ msgstr ""
 "dilyn namau i cofnodi eich dymuniad. Cofiwch defnyddio'r llymder \"Rhestr "
 "dymuniadau\"."
 
-#: 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 "
@@ -5570,7 +5570,7 @@ msgstr ""
 "HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
 "i gael popeth sydd angen."
 
-#: kdeui/kaboutkde.cpp:67
+#: tdeui/kaboutkde.cpp:67
 msgid ""
 "KDE is available free of charge, but making it is not free."
 "<br>"
@@ -5603,73 +5603,73 @@ msgstr ""
 "<br>"
 "<br>Diolch yn fawr iawn i chi ymlaen llaw am eich cefnogaeth. "
 
-#: kdeui/kaboutkde.cpp:81
+#: tdeui/kaboutkde.cpp:81
 #, c-format
 msgid "K Desktop Environment. Release %1"
 msgstr "Amgylchedd Penbwrdd KDE.  Rhyddhad %1"
 
-#: kdeui/kaboutkde.cpp:83
+#: tdeui/kaboutkde.cpp:83
 msgid ""
 "_: About KDE\n"
 "&About"
 msgstr "&Ynghylch"
 
-#: kdeui/kaboutkde.cpp:84
+#: tdeui/kaboutkde.cpp:84
 msgid "&Report Bugs or Wishes"
 msgstr "&Adrodd Namau neu Dymuniadau"
 
-#: kdeui/kaboutkde.cpp:85
+#: tdeui/kaboutkde.cpp:85
 msgid "&Join the KDE Team"
 msgstr "&Ymaelodi a'r tîm KDE"
 
-#: kdeui/kaboutkde.cpp:86
+#: tdeui/kaboutkde.cpp:86
 msgid "&Support KDE"
 msgstr "&Cefnogi KDE"
 
-#: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+#: tdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
 msgid "&Yes"
 msgstr "&Ie"
 
-#: kdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
+#: tdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
 msgid "&No"
 msgstr "&Nage"
 
-#: kdeui/kstdguiitem.cpp:120
+#: tdeui/kstdguiitem.cpp:120
 msgid "Discard changes"
 msgstr "Taflu newidiadau"
 
-#: kdeui/kstdguiitem.cpp:121
+#: tdeui/kstdguiitem.cpp:121
 msgid ""
 "Pressing this button will discard all recent changes made in this dialog"
 msgstr ""
 " Bydd gwthio'r botwm yma yn taflu pob newid diweddar a wnaethpwyd yn y blwch "
 "dewis"
 
-#: kdeui/kstdguiitem.cpp:127
+#: tdeui/kstdguiitem.cpp:127
 msgid "Save data"
 msgstr "Cadw'r data"
 
-#: kdeui/kstdguiitem.cpp:132
+#: tdeui/kstdguiitem.cpp:132
 msgid "&Do Not Save"
 msgstr "&Peidiwch â Chadw"
 
-#: kdeui/kstdguiitem.cpp:133
+#: tdeui/kstdguiitem.cpp:133
 msgid "Don't save data"
 msgstr "Peidio a chadw'r data"
 
-#: kdeui/kstdaction_p.h:44 kdeui/kstdguiitem.cpp:138
+#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
 msgid "Save &As..."
 msgstr "Cadw &Fel..."
 
-#: kdeui/kstdguiitem.cpp:139
+#: tdeui/kstdguiitem.cpp:139
 msgid "Save file with another name"
 msgstr "Cadw'r ffeil efo enw arall"
 
-#: kdeui/kstdguiitem.cpp:144
+#: tdeui/kstdguiitem.cpp:144
 msgid "Apply changes"
 msgstr "Cymhwyso'r newidiadau"
 
-#: 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"
@@ -5679,15 +5679,15 @@ msgstr ""
 "blwch dewis.\n"
 " Defnyddiwch hwn i arbrofi dewisiadau gwahanol."
 
-#: kdeui/kstdguiitem.cpp:153
+#: tdeui/kstdguiitem.cpp:153
 msgid "Administrator &Mode..."
 msgstr "Modd G&weinyddwr..."
 
-#: kdeui/kstdguiitem.cpp:153
+#: tdeui/kstdguiitem.cpp:153
 msgid "Enter Administrator Mode"
 msgstr "Newid i Fodd Gweinyddwr"
 
-#: 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 "
@@ -5696,192 +5696,192 @@ msgstr ""
 "Ar ôl clicio <b>Modd Gweinyddwr</b> byddwch yn eich gofyn am y cyfrinair "
 "gweinyddwr (gwraidd) er mwyn gwneud newidiadau sydd angen breintiau gwraidd."
 
-#: kdeui/kstdguiitem.cpp:162
+#: tdeui/kstdguiitem.cpp:162
 msgid "Clear input"
 msgstr "Clirio'r mewnbwn"
 
-#: kdeui/kstdguiitem.cpp:163
+#: tdeui/kstdguiitem.cpp:163
 msgid "Clear the input in the edit field"
 msgstr "Clirio'r mewnbwn yn y maes golygu"
 
-#: kdeui/kstdaction.cpp:62 kdeui/kstdguiitem.cpp:168
+#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
 msgid ""
 "_: show help\n"
 "&Help"
 msgstr "&Cymorth"
 
-#: kdeui/kstdguiitem.cpp:169
+#: tdeui/kstdguiitem.cpp:169
 msgid "Show help"
 msgstr "Dangos cymorth"
 
-#: kdeui/kstdguiitem.cpp:175
+#: tdeui/kstdguiitem.cpp:175
 msgid "Close the current window or document"
 msgstr "Cau'r ffenest neu ddogfen cyfredol"
 
-#: kdeui/kstdguiitem.cpp:181
+#: tdeui/kstdguiitem.cpp:181
 msgid "Reset all items to their default values"
 msgstr "Ailosod pob eitem i'w werth rhagosodol"
 
-#: kdeui/kstdaction.cpp:51 kdeui/kstdguiitem.cpp:188
+#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
 msgid ""
 "_: go back\n"
 "&Back"
 msgstr "Y&n ôl"
 
-#: kdeui/kstdguiitem.cpp:189
+#: tdeui/kstdguiitem.cpp:189
 msgid "Go back one step"
 msgstr "Ewch cam yn ôl"
 
-#: kdeui/kstdaction.cpp:56 kdeui/kstdguiitem.cpp:196
+#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
 msgid ""
 "_: go forward\n"
 "&Forward"
 msgstr "&Ymlaen"
 
-#: kdeui/kstdguiitem.cpp:197
+#: tdeui/kstdguiitem.cpp:197
 msgid "Go forward one step"
 msgstr "Ewch cam ymlaen"
 
-#: kdeui/kstdguiitem.cpp:208
+#: tdeui/kstdguiitem.cpp:208
 msgid "Opens the print dialog to print the current document"
 msgstr "Agor y blwch dewisiadau argraffu er mwyn argraffu'r ddogfen gyfredol"
 
-#: kdeui/kstdguiitem.cpp:214
+#: tdeui/kstdguiitem.cpp:214
 msgid "C&ontinue"
 msgstr "&Mynd ymlaen"
 
-#: kdeui/kstdguiitem.cpp:215
+#: tdeui/kstdguiitem.cpp:215
 msgid "Continue operation"
 msgstr "Ewch ymlaen a'r gweithrediad"
 
-#: kdeui/kstdguiitem.cpp:221
+#: tdeui/kstdguiitem.cpp:221
 msgid "Delete item(s)"
 msgstr " Dileu eitem(au)"
 
-#: kdeui/kstdguiitem.cpp:227
+#: tdeui/kstdguiitem.cpp:227
 msgid "Open file"
 msgstr "Agor ffeil"
 
-#: kdeui/kstdguiitem.cpp:233
+#: tdeui/kstdguiitem.cpp:233
 msgid "Quit application"
 msgstr "Gadael y cymhwysiant"
 
-#: kdeui/kstdguiitem.cpp:238
+#: tdeui/kstdguiitem.cpp:238
 msgid "&Reset"
 msgstr "A&ilosod"
 
-#: kdeui/kstdguiitem.cpp:239
+#: tdeui/kstdguiitem.cpp:239
 msgid "Reset configuration"
 msgstr "Ailodosd ffurfweddiad"
 
-#: kdeui/kstdguiitem.cpp:244
+#: tdeui/kstdguiitem.cpp:244
 msgid ""
 "_: Verb\n"
 "&Insert"
 msgstr "&Mewnosod"
 
-#: kdeui/kstdguiitem.cpp:249
+#: tdeui/kstdguiitem.cpp:249
 msgid "Confi&gure..."
 msgstr "Ffurf&weddu..."
 
-#: 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 "&Canfod"
 
-#: kdeui/kstdguiitem.cpp:274
+#: tdeui/kstdguiitem.cpp:274
 msgid "Test"
 msgstr "Profi"
 
-#: kdeui/kstdguiitem.cpp:284
+#: tdeui/kstdguiitem.cpp:284
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: kdeui/kjanuswidget.cpp:156
+#: tdeui/kjanuswidget.cpp:156
 #, fuzzy
 msgid "Empty Page"
 msgstr "Tudalen &Olaf"
 
-#: kdeui/ksyntaxhighlighter.cpp:477 kdeui/ksyntaxhighlighter.cpp:586
+#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
 msgid "As-you-type spell checking enabled."
 msgstr "Galluogir cywiro sillafu wrth deipio."
 
-#: kdeui/ksyntaxhighlighter.cpp:479
+#: tdeui/ksyntaxhighlighter.cpp:479
 msgid "As-you-type spell checking disabled."
 msgstr "Galluogir cywiro sillafu wrth deipio."
 
-#: kdeui/ksyntaxhighlighter.cpp:528
+#: tdeui/ksyntaxhighlighter.cpp:528
 msgid "Incremental Spellcheck"
 msgstr "Gwirio Sillafu Cynnyddol"
 
-#: kdeui/ksyntaxhighlighter.cpp:588
+#: tdeui/ksyntaxhighlighter.cpp:588
 msgid "Too many misspelled words. As-you-type spell checking disabled."
 msgstr ""
 "Gormod o eiriau sydd wedi cael eu cam-sillafu.  Analluogir cywiro sillafu wrth "
 "deipio."
 
-#: kdeui/kxmlguibuilder.cpp:166 kdeui/kxmlguibuilder.cpp:365
+#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
 msgid "No text!"
 msgstr "Dim testun!"
 
-#: kdeui/kauthicon.cpp:99
+#: tdeui/kauthicon.cpp:99
 msgid "Editing disabled"
 msgstr "Analluogir golygu"
 
-#: kdeui/kauthicon.cpp:100
+#: tdeui/kauthicon.cpp:100
 msgid "Editing enabled"
 msgstr "Alluogir golygu"
 
-#: kdeui/ktoolbarhandler.cpp:86
+#: tdeui/ktoolbarhandler.cpp:86
 msgid "Show Toolbar"
 msgstr "Dangos Bar Offer"
 
-#: kdeui/ktoolbarhandler.cpp:87
+#: tdeui/ktoolbarhandler.cpp:87
 msgid "Hide Toolbar"
 msgstr "Cuddio Bar Offer"
 
-#: kdeui/ktoolbarhandler.cpp:91
+#: tdeui/ktoolbarhandler.cpp:91
 msgid "Toolbars"
 msgstr "Barrau Offer:"
 
-#: kdeui/kdatepicker.cpp:88
+#: tdeui/kdatepicker.cpp:88
 #, c-format
 msgid "Week %1"
 msgstr "Wythnos %1"
 
-#: kdeui/kdatepicker.cpp:163
+#: tdeui/kdatepicker.cpp:163
 msgid "Next year"
 msgstr "Blwyddyn nesaf"
 
-#: kdeui/kdatepicker.cpp:164
+#: tdeui/kdatepicker.cpp:164
 msgid "Previous year"
 msgstr "Blwyddyn cynt"
 
-#: kdeui/kdatepicker.cpp:165
+#: tdeui/kdatepicker.cpp:165
 msgid "Next month"
 msgstr "Mis nesaf"
 
-#: kdeui/kdatepicker.cpp:166
+#: tdeui/kdatepicker.cpp:166
 msgid "Previous month"
 msgstr "Mis cynt"
 
-#: kdeui/kdatepicker.cpp:167
+#: tdeui/kdatepicker.cpp:167
 msgid "Select a week"
 msgstr "Dewiswch wythnos"
 
-#: kdeui/kdatepicker.cpp:168
+#: tdeui/kdatepicker.cpp:168
 msgid "Select a month"
 msgstr "Dewiswch mis"
 
-#: kdeui/kdatepicker.cpp:169
+#: tdeui/kdatepicker.cpp:169
 msgid "Select a year"
 msgstr "Dewiswch blwyddyn"
 
-#: kdeui/kdatepicker.cpp:170
+#: tdeui/kdatepicker.cpp:170
 msgid "Select the current day"
 msgstr "Dewis y diwrnod cyfredol"
 
-#: kdeui/kwhatsthismanager.cpp:50
+#: tdeui/kwhatsthismanager.cpp:50
 #, fuzzy
 msgid ""
 "<b>Not Defined</b>"
@@ -5894,74 +5894,74 @@ msgstr ""
 "hoffech ein helpu ni gan ddisgrifio'r celfigyn, croeso i chi <a "
 "href=\"submit-whatsthis\">anfon cymorth \"Beth yw Hwn?\"</a> ar ei gyfer."
 
-#: kdeui/kshortcutdialog.cpp:68
+#: tdeui/kshortcutdialog.cpp:68
 msgid "Configure Shortcut"
 msgstr "Ffurfweddu Byrlwybr"
 
-#: kdeui/kshortcutdialog.cpp:71
+#: tdeui/kshortcutdialog.cpp:71
 msgid "Advanced"
 msgstr "Uwch"
 
-#: kdeui/kedittoolbar.cpp:49
+#: tdeui/kedittoolbar.cpp:49
 msgid "--- line separator ---"
 msgstr ""
 
-#: kdeui/kedittoolbar.cpp:50
+#: tdeui/kedittoolbar.cpp:50
 msgid "--- separator ---"
 msgstr "--- gwahanydd ---"
 
-#: 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 "Ffurfio Bar Offer"
 
-#: 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
 #, fuzzy
 msgid "Reset Toolbars"
 msgstr "Barrau Offer:"
 
-#: 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 "Ail-osod"
 
-#: kdeui/kedittoolbar.cpp:761
+#: tdeui/kedittoolbar.cpp:761
 msgid "&Toolbar:"
 msgstr "&Bar Offer:"
 
-#: kdeui/kedittoolbar.cpp:777
+#: tdeui/kedittoolbar.cpp:777
 msgid "A&vailable actions:"
 msgstr "G&weithrediadau ar gael:"
 
-#: kdeui/kedittoolbar.cpp:795
+#: tdeui/kedittoolbar.cpp:795
 msgid "Curr&ent actions:"
 msgstr "Gweith&rediadau cyfredol:"
 
-#: kdeui/kedittoolbar.cpp:818
+#: tdeui/kedittoolbar.cpp:818
 msgid "Change &Icon..."
 msgstr "Newid E&icon..."
 
-#: kdeui/kedittoolbar.cpp:991
+#: tdeui/kedittoolbar.cpp:991
 msgid ""
 "This element will be replaced with all the elements of an embedded component."
 msgstr ""
 "Amnewidir yr elfen yma gan yr elfennau i gyd sy'n biau i gydran mewnol."
 
-#: kdeui/kedittoolbar.cpp:993
+#: tdeui/kedittoolbar.cpp:993
 msgid "<Merge>"
 msgstr "<Cyfuno>"
 
-#: kdeui/kedittoolbar.cpp:995
+#: tdeui/kedittoolbar.cpp:995
 msgid "<Merge %1>"
 msgstr "<Cyfuno %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."
@@ -5969,53 +5969,53 @@ msgstr ""
 "Rhestr ddinamig o weithrediadau yw hon.  Cewch ei symud, ond ar ôl ei diddymu "
 "na chewch ei ail-ychwanegu. "
 
-#: kdeui/kedittoolbar.cpp:1002
+#: tdeui/kedittoolbar.cpp:1002
 #, c-format
 msgid "ActionList: %1"
 msgstr "RhestrGweithred: %1"
 
-#: kdeui/kcolordialog.cpp:84
+#: tdeui/kcolordialog.cpp:84
 msgid ""
 "_: palette name\n"
 "* Recent Colors *"
 msgstr "* Lliwiau Diweddar *"
 
-#: kdeui/kcolordialog.cpp:85
+#: tdeui/kcolordialog.cpp:85
 msgid ""
 "_: palette name\n"
 "* Custom Colors *"
 msgstr "* Lliwiau Arferu *"
 
-#: kdeui/kcolordialog.cpp:86
+#: tdeui/kcolordialog.cpp:86
 msgid ""
 "_: palette name\n"
 "Forty Colors"
 msgstr ""
 
-#: kdeui/kcolordialog.cpp:87
+#: tdeui/kcolordialog.cpp:87
 #, fuzzy
 msgid ""
 "_: palette name\n"
 "Rainbow Colors"
 msgstr "* Lliwiau Diweddar *"
 
-#: 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 "Lliwiau a Enwir"
 
-#: kdeui/kcolordialog.cpp:717
+#: tdeui/kcolordialog.cpp:717
 msgid ""
 "Unable to read X11 RGB color strings. The following file location(s) were "
 "examined:\n"
@@ -6023,71 +6023,71 @@ msgstr ""
 "Methu darllen llinynnau lliw RGB X11. Fe edrychwyd yn y lleoliadau ffeil "
 "canlynol:\n"
 
-#: kdeui/kcolordialog.cpp:940
+#: tdeui/kcolordialog.cpp:940
 msgid "Select Color"
 msgstr "Dewis Lliw"
 
-#: 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 "&Ychwanegu at Liwiau Rhagosodedig"
 
-#: kdeui/kcolordialog.cpp:1140
+#: tdeui/kcolordialog.cpp:1140
 msgid "HTML:"
 msgstr "HTML:"
 
-#: kdeui/kcolordialog.cpp:1219
+#: tdeui/kcolordialog.cpp:1219
 msgid "Default color"
 msgstr "Lliw rhagosodol"
 
-#: kdeui/kcolordialog.cpp:1247
+#: tdeui/kcolordialog.cpp:1247
 msgid "-default-"
 msgstr "-rhagosodol-"
 
-#: kdeui/kcolordialog.cpp:1463
+#: tdeui/kcolordialog.cpp:1463
 msgid "-unnamed-"
 msgstr "-ddi-enw-"
 
-#: kdeui/kstdaction.cpp:61
+#: tdeui/kstdaction.cpp:61
 msgid ""
 "_: beginning (of line)\n"
 "&Home"
 msgstr "&Cartref"
 
-#: kdeui/kstdaction.cpp:240
+#: tdeui/kstdaction.cpp:240
 msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
 msgstr ""
 "Dangos Bar Dewislen"
 "<p>Dangos y bar dewislen eto ar ôl iddo gael ei guddio"
 
-#: kdeui/kstdaction.cpp:242
+#: tdeui/kstdaction.cpp:242
 msgid "Hide &Menubar"
 msgstr "Cuddio Bar &Dewislen"
 
-#: 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 "
@@ -6097,11 +6097,11 @@ msgstr ""
 "<p>Cuddio'r bar dewislen.  Fel rheol, gewch chi'r bar yn ôl eto gan "
 "ddefnyddio'r botwm de tu mewn i'r ffenest ei hun."
 
-#: kdeui/kstdaction.cpp:274 kdeui/kstdaction_p.h:97
+#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
 msgid "Show St&atusbar"
 msgstr "Dangos Bar Cyfl&wr"
 
-#: 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 "
@@ -6111,11 +6111,11 @@ msgstr ""
 "<p>Dangos y bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
 "gwybodaeth cyflwr."
 
-#: kdeui/kstdaction.cpp:278
+#: tdeui/kstdaction.cpp:278
 msgid "Hide St&atusbar"
 msgstr "Cuddio Bar Cyf&lwr"
 
-#: 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 "
@@ -6125,23 +6125,23 @@ msgstr ""
 "<p>Cuddio'r bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
 "gwybodaeth cyflwr."
 
-#: kdeui/kpassdlg.cpp:372
+#: tdeui/kpassdlg.cpp:372
 msgid "&Password:"
 msgstr "&Cyfrinair:"
 
-#: kdeui/kpassdlg.cpp:391
+#: tdeui/kpassdlg.cpp:391
 msgid "&Keep password"
 msgstr "&Cadw cyfrinair"
 
-#: kdeui/kpassdlg.cpp:403
+#: tdeui/kpassdlg.cpp:403
 msgid "&Verify:"
 msgstr "&Gwireddu:"
 
-#: kdeui/kpassdlg.cpp:425
+#: tdeui/kpassdlg.cpp:425
 msgid "Password strength meter:"
 msgstr "Faint mor gryf yw'r cyfrinair:"
 
-#: 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"
@@ -6155,15 +6155,15 @@ msgstr ""
 "- gymysgu priflythrennau a llythrennau bach;\n"
 "- ddefnyddio rhifau, a symbolau fel #, ymysg y llythrennau."
 
-#: kdeui/kpassdlg.cpp:445 kdeui/kpassdlg.cpp:617
+#: tdeui/kpassdlg.cpp:445 tdeui/kpassdlg.cpp:617
 msgid "Passwords do not match"
 msgstr "Nid yw'r cyfrineiriau yn cydweddu"
 
-#: kdeui/kpassdlg.cpp:515
+#: tdeui/kpassdlg.cpp:515
 msgid "You entered two different passwords. Please try again."
 msgstr "Rhoddwyd dau gyfrinair gwahanol.  Ceisiwch eto.  "
 
-#: 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"
@@ -6181,15 +6181,15 @@ msgstr ""
 "\n"
 "Hoffech ddefnyddio'r cyfrinair yma serch hynny?"
 
-#: kdeui/kpassdlg.cpp:530
+#: tdeui/kpassdlg.cpp:530
 msgid "Low Password Strength"
 msgstr "Nid yw'r cyfrinair yn gryf iawn"
 
-#: kdeui/kpassdlg.cpp:611
+#: tdeui/kpassdlg.cpp:611
 msgid "Password is empty"
 msgstr "Mae'r cyfrineiriau yn wag"
 
-#: kdeui/kpassdlg.cpp:614
+#: tdeui/kpassdlg.cpp:614
 #, c-format
 msgid ""
 "_n: Password must be at least 1 character long\n"
@@ -6198,35 +6198,35 @@ msgstr ""
 "Rhaid i'r cyfrinair fod o leiaf 1 nod\n"
 "Rhaid i'r cyfrinair fod o leiaf %n o nodau"
 
-#: kdeui/kpassdlg.cpp:616
+#: tdeui/kpassdlg.cpp:616
 msgid "Passwords match"
 msgstr "Mae'r cyfrineiriau yn cydweddu"
 
-#: kdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
+#: tdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
 msgid "Check Spelling"
 msgstr "Gwirio Sillafu"
 
-#: kdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
+#: tdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
 msgid "&Finished"
 msgstr "Wedi'i Orffe&n"
 
-#: kdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
+#: tdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
 msgid "Clear &History"
 msgstr "Gwaredu &Hanes"
 
-#: kdeui/kcombobox.cpp:584
+#: tdeui/kcombobox.cpp:584
 msgid "No further item in the history."
 msgstr "Dim mwy o eitemau yn yr hanes."
 
-#: kdeui/klineeditdlg.cpp:92
+#: tdeui/klineeditdlg.cpp:92
 msgid "&Browse..."
 msgstr "&Pori..."
 
-#: kdeui/kdialogbase.cpp:636
+#: tdeui/kdialogbase.cpp:636
 msgid "&Try"
 msgstr "&Arbrofi"
 
-#: 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."
@@ -6234,11 +6234,11 @@ msgstr ""
 " Os gwthiwch y botwm <b>Iawn</b>, defnyddir\n"
 " pob newid a wnaethoch i fynd ymlaen."
 
-#: kdeui/kdialogbase.cpp:911
+#: tdeui/kdialogbase.cpp:911
 msgid "Accept settings"
 msgstr "Derbyn gosodiadau"
 
-#: 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"
@@ -6248,71 +6248,71 @@ msgstr ""
 " i'r rhaglen, ond ni chaeir y blwch dewis.\n"
 " Defnyddiwch hwn er mwyn arbrofi dewisiadau gwahanol."
 
-#: kdeui/kdialogbase.cpp:941
+#: tdeui/kdialogbase.cpp:941
 msgid "Apply settings"
 msgstr "Gweithredu gosodiadau"
 
-#: kdeui/kdialogbase.cpp:1130
+#: tdeui/kdialogbase.cpp:1130
 msgid "&Details"
 msgstr "&Manylion"
 
-#: kdeui/kdialogbase.cpp:1538
+#: tdeui/kdialogbase.cpp:1538
 msgid "Get help..."
 msgstr "Nôl cymorth..."
 
-#: kdeui/keditlistbox.cpp:124
+#: tdeui/keditlistbox.cpp:124
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: kdeui/keditlistbox.cpp:148
+#: tdeui/keditlistbox.cpp:148
 msgid "Move &Up"
 msgstr "Sym&ud i fyny"
 
-#: kdeui/keditlistbox.cpp:153
+#: tdeui/keditlistbox.cpp:153
 msgid "Move &Down"
 msgstr "Symu&d i lawr"
 
-#: kdeui/kbugreport.cpp:70
+#: tdeui/kbugreport.cpp:70
 msgid "Submit Bug Report"
 msgstr "Cyflwyno Adroddiad Nam"
 
-#: kdeui/kbugreport.cpp:110
+#: tdeui/kbugreport.cpp:110
 msgid ""
 "Your email address. If incorrect, use the Configure Email button to change it"
 msgstr ""
 " Eich cyfeiriad ebost. Os bo'n anghywir, defnyddiwch y botwm Ffurfweddu Ebost "
 "i'w newid."
 
-#: kdeui/kbugreport.cpp:111
+#: tdeui/kbugreport.cpp:111
 msgid "From:"
 msgstr "Oddiwrth:"
 
-#: kdeui/kbugreport.cpp:120
+#: tdeui/kbugreport.cpp:120
 msgid "Configure Email..."
 msgstr "Ffurfweddu Ebost ..."
 
-#: kdeui/kbugreport.cpp:127
+#: tdeui/kbugreport.cpp:127
 msgid "The email address this bug report is sent to."
 msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi."
 
-#: kdeui/kbugreport.cpp:128
+#: tdeui/kbugreport.cpp:128
 msgid "To:"
 msgstr "I:"
 
-#: kdeui/kbugreport.cpp:135
+#: tdeui/kbugreport.cpp:135
 msgid "&Send"
 msgstr "&Anfon"
 
-#: kdeui/kbugreport.cpp:135
+#: tdeui/kbugreport.cpp:135
 msgid "Send bug report."
 msgstr "Anfon Adroddiad Nam"
 
-#: kdeui/kbugreport.cpp:136
+#: tdeui/kbugreport.cpp:136
 #, c-format
 msgid "Send this bug report to %1."
 msgstr "Anfonwch yr adroddiad nam yma i %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"
@@ -6320,11 +6320,11 @@ msgstr ""
 " Y cymhwysiad a ddymunir cyflwyno adroddiad nam amdano - os yn anghywir, "
 "defnyddiwch yr eitem dewislen Adrodd Nam o'r rhaglen cywir."
 
-#: kdeui/kbugreport.cpp:148
+#: tdeui/kbugreport.cpp:148
 msgid "Application: "
 msgstr "Cymhwysiad:"
 
-#: 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"
@@ -6332,49 +6332,49 @@ msgstr ""
 " Fersiwn y cymhwysiad yma - sicrhewch nad oes fersiwn newyddach ar gael cyn "
 "anfon adroddiad nam"
 
-#: kdeui/kbugreport.cpp:180
+#: tdeui/kbugreport.cpp:180
 msgid "no version set (programmer error!)"
 msgstr "dim fersiwn eto (nam gan y rhaglennwr!)"
 
-#: kdeui/kbugreport.cpp:190
+#: tdeui/kbugreport.cpp:190
 msgid "OS:"
 msgstr "SG:"
 
-#: kdeui/kbugreport.cpp:202
+#: tdeui/kbugreport.cpp:202
 msgid "Compiler:"
 msgstr "Crynhoydd:"
 
-#: kdeui/kbugreport.cpp:210
+#: tdeui/kbugreport.cpp:210
 msgid "Se&verity"
 msgstr "Lly&mder"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Critical"
 msgstr "Critigol"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Grave"
 msgstr "Peryglus"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid ""
 "_: normal severity\n"
 "Normal"
 msgstr "Arferol"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Wishlist"
 msgstr "Rhestr dymuniadau"
 
-#: kdeui/kbugreport.cpp:212
+#: tdeui/kbugreport.cpp:212
 msgid "Translation"
 msgstr "Cyfieithiad"
 
-#: kdeui/kbugreport.cpp:225
+#: tdeui/kbugreport.cpp:225
 msgid "S&ubject: "
 msgstr " &Pwnc:"
 
-#: 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"
@@ -6385,7 +6385,7 @@ msgstr ""
 "adroddiad nam.\n"
 "Os gwthiwch \"Anfon\", anfonir neges ebost i ofalwr y rhaglen yma.\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 "
@@ -6397,23 +6397,23 @@ msgstr ""
 " lle welwch ffurflen i'w llenwi.\n"
 " Trosglwyddir y wybodaeth a arddangosir uchod i'r gweinydd hwnnw."
 
-#: kdeui/kbugreport.cpp:260
+#: tdeui/kbugreport.cpp:260
 msgid "&Launch Bug Report Wizard"
 msgstr "&Cychwyn Dewin Adrodd Namau"
 
-#: kdeui/kbugreport.cpp:298
+#: tdeui/kbugreport.cpp:298
 msgid ""
 "_: unknown program name\n"
 "unknown"
 msgstr " anhysbys"
 
-#: 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 "Mae'n rhaid penodi pwnc a disgrifiad hefyd cyn anfonir yr adroddiad."
 
-#: 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>"
@@ -6436,7 +6436,7 @@ msgstr ""
 "<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod?  Os "
 "nac ydy, dewiswch llymder is.  Diolch!</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>"
@@ -6458,7 +6458,7 @@ msgstr ""
 "<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod? Os "
 "nac ydy, dewiswch llymder is. Diolch!</p>"
 
-#: kdeui/kbugreport.cpp:409
+#: tdeui/kbugreport.cpp:409
 msgid ""
 "Unable to send the bug report.\n"
 "Please submit a bug report manually...\n"
@@ -6468,11 +6468,11 @@ msgstr ""
 " Anfonwch adroddiad nam â llaw ...\n"
 " Gweler http://bugs.kde.org am fanylion."
 
-#: kdeui/kbugreport.cpp:417
+#: tdeui/kbugreport.cpp:417
 msgid "Bug report sent, thank you for your input."
 msgstr "Wedi gyrru'r adroddiad nam, diolch am eich cymorth."
 
-#: kdeui/kbugreport.cpp:426
+#: tdeui/kbugreport.cpp:426
 msgid ""
 "Close and discard\n"
 "edited message?"
@@ -6480,239 +6480,239 @@ msgstr ""
 "Cau a taflu'r neges\n"
 " a olygwyd?"
 
-#: kdeui/kbugreport.cpp:427
+#: tdeui/kbugreport.cpp:427
 msgid "Close Message"
 msgstr "Cau Neges"
 
-#: kdeui/kcolorcombo.cpp:187 kdeui/kcolorcombo.cpp:240
+#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
 msgid "Custom..."
 msgstr "Addasu ..."
 
-#: kdeui/ksystemtray.cpp:190
+#: tdeui/ksystemtray.cpp:190
 msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau terfynu <b>'%1'</b>?</qt>"
 
-#: kdeui/ksystemtray.cpp:193
+#: tdeui/ksystemtray.cpp:193
 msgid "Confirm Quit From System Tray"
 msgstr "Cadarnhau Terfynu o'r Cafn Cysawd"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:141
+#: tdeui/kpixmapregionselectorwidget.cpp:141
 msgid "Image Operations"
 msgstr "Gweithrediadau Delwedd"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:143
+#: tdeui/kpixmapregionselectorwidget.cpp:143
 msgid "&Rotate Clockwise"
 msgstr "Cylchdroi yn &Glocwedd"
 
-#: kdeui/kpixmapregionselectorwidget.cpp:148
+#: tdeui/kpixmapregionselectorwidget.cpp:148
 msgid "Rotate &Counterclockwise"
 msgstr "Cylchdroi yn &Wrthglocwedd"
 
-#: kdeui/kdockwidget.cpp:237
+#: tdeui/kdockwidget.cpp:237
 msgid ""
 "_: Freeze the window geometry\n"
 "Freeze"
 msgstr "Rhewi"
 
-#: kdeui/kdockwidget.cpp:244
+#: tdeui/kdockwidget.cpp:244
 msgid ""
 "_: Dock this window\n"
 "Dock"
 msgstr "Clymu"
 
-#: kdeui/kdockwidget.cpp:251
+#: tdeui/kdockwidget.cpp:251
 msgid "Detach"
 msgstr "Dat-glymu"
 
-#: kdeui/kwizard.cpp:48
+#: tdeui/kwizard.cpp:48
 msgid "&Back"
 msgstr "&Yn ôl"
 
-#: kdeui/kwizard.cpp:49
+#: tdeui/kwizard.cpp:49
 msgid ""
 "_: Opposite to Back\n"
 "&Next"
 msgstr "&Nesaf"
 
-#: kdeui/khelpmenu.cpp:130 kdeui/kstdaction_p.h:108
+#: tdeui/khelpmenu.cpp:130 tdeui/kstdaction_p.h:108
 msgid "%1 &Handbook"
 msgstr "%1 &Llawlyfr"
 
-#: kdeui/khelpmenu.cpp:139
+#: tdeui/khelpmenu.cpp:139
 msgid "What's &This"
 msgstr "Beth yw &Hyn"
 
-#: kdeui/khelpmenu.cpp:150 kdeui/kstdaction_p.h:111
+#: tdeui/khelpmenu.cpp:150 tdeui/kstdaction_p.h:111
 msgid "&Report Bug..."
 msgstr "&Adroddi nam"
 
-#: kdeui/khelpmenu.cpp:159 kdeui/kstdaction_p.h:112
+#: tdeui/khelpmenu.cpp:159 tdeui/kstdaction_p.h:112
 #, fuzzy
 msgid "Switch application &language..."
 msgstr "gosod enw'r cymhwysiad"
 
-#: kdeui/khelpmenu.cpp:170 kdeui/kstdaction_p.h:113
+#: tdeui/khelpmenu.cpp:170 tdeui/kstdaction_p.h:113
 #, c-format
 msgid "&About %1"
 msgstr "&Ynglyn a %1"
 
-#: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114
+#: tdeui/khelpmenu.cpp:176 tdeui/kstdaction_p.h:114
 msgid "About &KDE"
 msgstr "Ynglyn a &Kde"
 
-#: kdeui/kactionclasses.cpp:2072
+#: tdeui/kactionclasses.cpp:2072
 msgid "Exit F&ull Screen Mode"
 msgstr "Gadael &Modd Sgrîn Llawn"
 
-#: kdeui/kactionclasses.cpp:2077 kdeui/kstdaction_p.h:98
+#: tdeui/kactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
 msgid "F&ull Screen Mode"
 msgstr "&Modd Sgrîn Llawn"
 
-#: kdeui/klistviewsearchline.cpp:243
+#: tdeui/klistviewsearchline.cpp:243
 msgid "Search Columns"
 msgstr "Chwilio Colofnau"
 
-#: kdeui/klistviewsearchline.cpp:245
+#: tdeui/klistviewsearchline.cpp:245
 msgid "All Visible Columns"
 msgstr "Pob Colofn Weledig"
 
-#: kdeui/klistviewsearchline.cpp:260
+#: tdeui/klistviewsearchline.cpp:260
 msgid ""
 "_: Column number %1\n"
 "Column No. %1"
 msgstr "Colofn %1"
 
-#: kdeui/klistviewsearchline.cpp:455
+#: tdeui/klistviewsearchline.cpp:455
 msgid "S&earch:"
 msgstr "C&hwilio"
 
-#: kdeui/ktip.cpp:206
+#: tdeui/ktip.cpp:206
 msgid "Tip of the Day"
 msgstr "Awgrymiad y Dydd"
 
-#: kdeui/ktip.cpp:224
+#: tdeui/ktip.cpp:224
 msgid ""
 "Did you know...?\n"
 msgstr ""
 " Oeddech chi'n gwybod ...?\n"
 
-#: kdeui/ktip.cpp:287
+#: tdeui/ktip.cpp:287
 msgid "&Show tips on startup"
 msgstr "&Dangos awgrymiadau wrth gychwyn"
 
-#: kdeui/ktoolbar.cpp:2040
+#: tdeui/ktoolbar.cpp:2040
 msgid "Toolbar Menu"
 msgstr "Dewislen Bar Offer"
 
-#: kdeui/ktoolbar.cpp:2043
+#: tdeui/ktoolbar.cpp:2043
 msgid ""
 "_: toolbar position string\n"
 "Top"
 msgstr " Top"
 
-#: kdeui/ktoolbar.cpp:2044
+#: tdeui/ktoolbar.cpp:2044
 msgid ""
 "_: toolbar position string\n"
 "Left"
 msgstr "Chwith"
 
-#: kdeui/ktoolbar.cpp:2045
+#: tdeui/ktoolbar.cpp:2045
 msgid ""
 "_: toolbar position string\n"
 "Right"
 msgstr "De"
 
-#: kdeui/ktoolbar.cpp:2046
+#: tdeui/ktoolbar.cpp:2046
 msgid ""
 "_: toolbar position string\n"
 "Bottom"
 msgstr " Gwaelod"
 
-#: kdeui/ktoolbar.cpp:2048
+#: tdeui/ktoolbar.cpp:2048
 msgid ""
 "_: toolbar position string\n"
 "Floating"
 msgstr "Arnofio"
 
-#: kdeui/ktoolbar.cpp:2049
+#: tdeui/ktoolbar.cpp:2049
 msgid ""
 "_: min toolbar\n"
 "Flat"
 msgstr " Gwastad"
 
-#: kdeui/ktoolbar.cpp:2052
+#: tdeui/ktoolbar.cpp:2052
 msgid "Icons Only"
 msgstr "Eiconau yn Unig"
 
-#: kdeui/ktoolbar.cpp:2053
+#: tdeui/ktoolbar.cpp:2053
 msgid "Text Only"
 msgstr "Testun yn Unig"
 
-#: kdeui/ktoolbar.cpp:2054
+#: tdeui/ktoolbar.cpp:2054
 msgid "Text Alongside Icons"
 msgstr "Testun wrth Ochr Eiconau"
 
-#: kdeui/ktoolbar.cpp:2055
+#: tdeui/ktoolbar.cpp:2055
 msgid "Text Under Icons"
 msgstr "Testun dan Eiconau"
 
-#: kdeui/ktoolbar.cpp:2080 kdeui/ktoolbar.cpp:2101
+#: tdeui/ktoolbar.cpp:2080 tdeui/ktoolbar.cpp:2101
 msgid "Small (%1x%2)"
 msgstr "Bach (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2082 kdeui/ktoolbar.cpp:2103
+#: tdeui/ktoolbar.cpp:2082 tdeui/ktoolbar.cpp:2103
 msgid "Medium (%1x%2)"
 msgstr "Canol (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2084 kdeui/ktoolbar.cpp:2105
+#: tdeui/ktoolbar.cpp:2084 tdeui/ktoolbar.cpp:2105
 msgid "Large (%1x%2)"
 msgstr "Mawr (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2086 kdeui/ktoolbar.cpp:2107
+#: tdeui/ktoolbar.cpp:2086 tdeui/ktoolbar.cpp:2107
 msgid "Huge (%1x%2)"
 msgstr "Enfawr (%1x%2)"
 
-#: kdeui/ktoolbar.cpp:2118
+#: tdeui/ktoolbar.cpp:2118
 msgid "Text Position"
 msgstr "Lleoliad Testun"
 
-#: kdeui/ktoolbar.cpp:2120
+#: tdeui/ktoolbar.cpp:2120
 msgid "Icon Size"
 msgstr "Maint Eicon"
 
-#: kdeui/kaboutdialog.cpp:93
+#: tdeui/kaboutdialog.cpp:93
 msgid "Task"
 msgstr "Tasg"
 
-#: kdeui/kaboutdialog.cpp:704
+#: tdeui/kaboutdialog.cpp:704
 msgid "%1 %2 (Using KDE %3)"
 msgstr "%1 %2 (Defnyddio 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 "Cyfrannwyr Eraill:"
 
-#: kdeui/kaboutdialog.cpp:1327
+#: tdeui/kaboutdialog.cpp:1327
 msgid "(No logo available)"
 msgstr "(dim logo ar gael)"
 
-#: kdeui/kaboutdialog.cpp:1772
+#: tdeui/kaboutdialog.cpp:1772
 msgid "Image missing"
 msgstr "Llun ar goll"
 
-#: kdeui/ktimezonewidget.cpp:45
+#: tdeui/ktimezonewidget.cpp:45
 msgid "Area"
 msgstr "Ardal"
 
-#: kab/addressbook.cc:295 kdeui/ktimezonewidget.cpp:47
+#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
 msgid "Comment"
 msgstr "Esboniad"
 
-#: 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?"
@@ -6720,7 +6720,7 @@ msgstr ""
 " Wedi cyrraedd diwedd y ddogfen.\n"
 " Ail-ddechrau o'r dechrau?"
 
-#: 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?"
@@ -6728,87 +6728,87 @@ msgstr ""
 "  Wedi cyrraedd dechrau'r ddogfen.\n"
 " Ail-ddechrau o'r diwedd?"
 
-#: kdeui/keditcl2.cpp:711 kdeui/keditcl2.cpp:844
+#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
 msgid "Find:"
 msgstr "Canfod:"
 
-#: kdeui/keditcl2.cpp:728 kdeui/keditcl2.cpp:868
+#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
 msgid "Case &sensitive"
 msgstr "Mae llythrennau bras o &bwys"
 
-#: 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 "Canfod &yn ôl"
 
-#: kdeui/keditcl2.cpp:833
+#: tdeui/keditcl2.cpp:833
 msgid "Replace &All"
 msgstr "Amnewid y &Cwbl"
 
-#: kdeui/keditcl2.cpp:852
+#: tdeui/keditcl2.cpp:852
 msgid "Replace with:"
 msgstr "Amnewid efo:"
 
-#: kdeui/keditcl2.cpp:984
+#: tdeui/keditcl2.cpp:984
 msgid "Go to line:"
 msgstr "Mynd i linell:"
 
-#: kdeui/kwindowlistmenu.cpp:129
+#: tdeui/twindowlistmenu.cpp:129
 msgid "Unclutter Windows"
 msgstr "Dad-lanastrio Ffenestri"
 
-#: kdeui/kwindowlistmenu.cpp:131
+#: tdeui/twindowlistmenu.cpp:131
 msgid "Cascade Windows"
 msgstr "Rhaeadru Ffenestri"
 
-#: kdeui/kwindowlistmenu.cpp:185
+#: tdeui/twindowlistmenu.cpp:185
 msgid "On All Desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: kdeui/kwindowlistmenu.cpp:213
+#: tdeui/twindowlistmenu.cpp:213
 msgid "No Windows"
 msgstr "Dim Ffenestri"
 
-#: kdeui/ktextedit.cpp:231
+#: tdeui/ktextedit.cpp:231
 msgid "Check Spelling..."
 msgstr "Gwirio Sillafu..."
 
-#: kdeui/ktextedit.cpp:237
+#: tdeui/ktextedit.cpp:237
 msgid "Auto Spell Check"
 msgstr "Hunan-wirio Sillafu"
 
-#: kdeui/ktextedit.cpp:241
+#: tdeui/ktextedit.cpp:241
 msgid "Allow Tabulations"
 msgstr "Gadael Tablyddion"
 
-#: kdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
+#: tdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
 msgid "Spell Checking"
 msgstr "Cywiro Sillafu"
 
-#: kdeui/kspell.cpp:1176
+#: tdeui/kspell.cpp:1176
 msgid "You have to restart the dialog for changes to take effect"
 msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
 
-#: kdeui/kspell.cpp:1402
+#: tdeui/kspell.cpp:1402
 msgid "Spell Checker"
 msgstr "Cywirydd Sillafu"
 
-#: 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 "&Dadwneud: %1"
 
-#: kdeui/kcommand.cpp:192 kdeui/kcommand.cpp:247
+#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
 #, c-format
 msgid "&Redo: %1"
 msgstr "&Ail-wneud: %1"
 
-#: kdeui/kcommand.cpp:322
+#: tdeui/kcommand.cpp:322
 #, c-format
 msgid "Undo: %1"
 msgstr "Dadwneud: %1"
 
-#: kdeui/kcommand.cpp:341 kdeui/kcommand.cpp:346
+#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
 #, c-format
 msgid "Redo: %1"
 msgstr "Ail-wneud: %1"
@@ -8011,10 +8011,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: Ni ddylir cychwyn y rhaglen yma â llaw.\n"
-"klauncher: Cychwynnir yn ymysgogol gan kdeinit.\n"
+"klauncher: Cychwynnir yn ymysgogol gan tdeinit.\n"
 
 #: kinit/klauncher.cpp:743
 msgid "KDEInit could not launch '%1'."
@@ -9384,288 +9384,288 @@ msgstr ""
 msgid "Decryption error."
 msgstr "Disgrifiad"
 
-#: kdeui/kstdaction_p.h:40
+#: tdeui/kstdaction_p.h:40
 msgid "&New"
 msgstr "&Newydd"
 
-#: kdeui/kstdaction_p.h:45
+#: tdeui/kstdaction_p.h:45
 msgid "Re&vert"
 msgstr "&Dychwelyd"
 
-#: kdeui/kstdaction_p.h:48
+#: tdeui/kstdaction_p.h:48
 msgid "Print Previe&w..."
 msgstr "&Rhagweld Argraffiad"
 
-#: kdeui/kstdaction_p.h:49
+#: tdeui/kstdaction_p.h:49
 msgid "&Mail..."
 msgstr "&Ebost..."
 
-#: kdeui/kstdaction_p.h:53
+#: tdeui/kstdaction_p.h:53
 msgid "Re&do"
 msgstr "Ail-&wneud"
 
-#: kdeui/kstdaction_p.h:59
+#: tdeui/kstdaction_p.h:59
 msgid "Select &All"
 msgstr "Dewis Pope&th"
 
-#: kdeui/kstdaction_p.h:60
+#: tdeui/kstdaction_p.h:60
 msgid "Dese&lect"
 msgstr "Dad-&ddewis"
 
-#: kdeui/kstdaction_p.h:64
+#: tdeui/kstdaction_p.h:64
 msgid "Find Pre&vious"
 msgstr "Canfod &Diwethaf"
 
-#: kdeui/kstdaction_p.h:67
+#: tdeui/kstdaction_p.h:67
 msgid "&Actual Size"
 msgstr "Maint &Gwir"
 
-#: kdeui/kstdaction_p.h:68
+#: tdeui/kstdaction_p.h:68
 msgid "&Fit to Page"
 msgstr "&Ffitio i Dudalen"
 
-#: kdeui/kstdaction_p.h:69
+#: tdeui/kstdaction_p.h:69
 msgid "Fit to Page &Width"
 msgstr "Ffitio i &Led Tudalen"
 
-#: kdeui/kstdaction_p.h:70
+#: tdeui/kstdaction_p.h:70
 msgid "Fit to Page &Height"
 msgstr "Ffitio i &Hyd Tudalen"
 
-#: kdeui/kstdaction_p.h:71
+#: tdeui/kstdaction_p.h:71
 msgid "Zoom &In"
 msgstr "Ne&sàu"
 
-#: kdeui/kstdaction_p.h:72
+#: tdeui/kstdaction_p.h:72
 msgid "Zoom &Out"
 msgstr "Pell&hàu"
 
-#: kdeui/kstdaction_p.h:73
+#: tdeui/kstdaction_p.h:73
 msgid "&Zoom..."
 msgstr "&Chwyddo.."
 
-#: kdeui/kstdaction_p.h:75
+#: tdeui/kstdaction_p.h:75
 msgid "&Redisplay"
 msgstr "&Ail-arddangos"
 
-#: kdeui/kstdaction_p.h:77
+#: tdeui/kstdaction_p.h:77
 msgid "&Up"
 msgstr "&Fyny"
 
-#: kdeui/kstdaction_p.h:82
+#: tdeui/kstdaction_p.h:82
 msgid "&Previous Page"
 msgstr "Tudalen &Diwethaf"
 
-#: kdeui/kstdaction_p.h:83
+#: tdeui/kstdaction_p.h:83
 msgid "&Next Page"
 msgstr "&Tudalen Nesaf"
 
-#: kdeui/kstdaction_p.h:84
+#: tdeui/kstdaction_p.h:84
 msgid "&Go To..."
 msgstr "&Mynd i.."
 
-#: kdeui/kstdaction_p.h:85
+#: tdeui/kstdaction_p.h:85
 msgid "&Go to Page..."
 msgstr "&Mynd i Dudalen"
 
-#: kdeui/kstdaction_p.h:86
+#: tdeui/kstdaction_p.h:86
 msgid "&Go to Line..."
 msgstr "&Mynd i Linell..."
 
-#: kdeui/kstdaction_p.h:87
+#: tdeui/kstdaction_p.h:87
 msgid "&First Page"
 msgstr "Tudalen &Gyntaf"
 
-#: kdeui/kstdaction_p.h:88
+#: tdeui/kstdaction_p.h:88
 msgid "&Last Page"
 msgstr "Tudalen &Olaf"
 
-#: kdeui/kstdaction_p.h:91
+#: tdeui/kstdaction_p.h:91
 msgid "&Edit Bookmarks"
 msgstr "&Golygu Tudnodau"
 
-#: kdeui/kstdaction_p.h:99
+#: tdeui/kstdaction_p.h:99
 msgid "&Save Settings"
 msgstr "&Cadw Gosodiadau"
 
-#: kdeui/kstdaction_p.h:100
+#: tdeui/kstdaction_p.h:100
 msgid "Configure S&hortcuts..."
 msgstr "Ffurfweddu &Byrlwybrau"
 
-#: kdeui/kstdaction_p.h:101
+#: tdeui/kstdaction_p.h:101
 msgid "&Configure %1..."
 msgstr "&Ffurweddu %1..."
 
-#: kdeui/kstdaction_p.h:102
+#: tdeui/kstdaction_p.h:102
 msgid "Configure Tool&bars..."
 msgstr "Ffurfweddu Barrau &Offer"
 
-#: kdeui/kstdaction_p.h:103
+#: tdeui/kstdaction_p.h:103
 msgid "Configure &Notifications..."
 msgstr "Ffurfweddu &Negesau ..."
 
-#: kdeui/kstdaction_p.h:109
+#: tdeui/kstdaction_p.h:109
 msgid "What's &This?"
 msgstr "Beth yw &Hwn?"
 
-#: kdeui/kstdaction_p.h:110
+#: tdeui/kstdaction_p.h:110
 msgid "Tip of the &Day"
 msgstr "Awgrymiad y &Dydd"
 
-#: 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 ""
 
-#: kdecore/kde-config.cpp.in:19
+#: tdecore/kde-config.cpp.in:19
 msgid "Compiled in prefix for KDE libraries"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:20
+#: tdecore/kde-config.cpp.in:20
 msgid "Compiled in exec_prefix for KDE libraries"
 msgstr ""
 
-#: 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 ""
 
-#: kdecore/kde-config.cpp.in:23
+#: tdecore/kde-config.cpp.in:23
 msgid "Compiled in version string for KDE libraries"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:24
+#: tdecore/kde-config.cpp.in:24
 #, fuzzy
 msgid "Available KDE resource types"
 msgstr "Cyfeiriadau ar gael:"
 
-#: 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 ""
 
-#: 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 ""
 
-#: kdecore/kde-config.cpp.in:169
+#: tdecore/kde-config.cpp.in:169
 msgid "CGIs to run from kdehelp"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:170
+#: tdecore/kde-config.cpp.in:170
 #, fuzzy
 msgid "Configuration files"
 msgstr "Ffurfwedd"
 
-#: kdecore/kde-config.cpp.in:171
+#: tdecore/kde-config.cpp.in:171
 #, fuzzy
 msgid "Where applications store data"
 msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
 
-#: kdecore/kde-config.cpp.in:172
+#: tdecore/kde-config.cpp.in:172
 msgid "Executables in $prefix/bin"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:173
+#: tdecore/kde-config.cpp.in:173
 #, fuzzy
 msgid "HTML documentation"
 msgstr "Gosodiadau HTML"
 
-#: kdecore/kde-config.cpp.in:174
+#: tdecore/kde-config.cpp.in:174
 msgid "Icons"
 msgstr "Eiconau"
 
-#: kdecore/kde-config.cpp.in:175
+#: tdecore/kde-config.cpp.in:175
 #, fuzzy
 msgid "Configuration description files"
 msgstr "Ffeil ddewisiadau am greu côd"
 
-#: 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 ""
 
-#: kdecore/kde-config.cpp.in:179
+#: tdecore/kde-config.cpp.in:179
 msgid "Mime types"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Qt plugins"
 msgstr "Ategyn arddull wê"
 
-#: kdecore/kde-config.cpp.in:182
+#: tdecore/kde-config.cpp.in:182
 msgid "Services"
 msgstr "Gwasanaethau"
 
-#: 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
 #, fuzzy
 msgid "Application sounds"
 msgstr "Cymhwysiad:"
 
-#: kdecore/kde-config.cpp.in:185
+#: tdecore/kde-config.cpp.in:185
 msgid "Templates"
 msgstr "Patrymluniau"
 
-#: kdecore/kde-config.cpp.in:186
+#: tdecore/kde-config.cpp.in:186
 msgid "Wallpapers"
 msgstr "Papurau Wal"
 
-#: kdecore/kde-config.cpp.in:187
+#: tdecore/kde-config.cpp.in:187
 msgid "XDG Application menu (.desktop files)"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:188
+#: tdecore/kde-config.cpp.in:188
 msgid "XDG Menu descriptions (.directory files)"
 msgstr ""
 
-#: kdecore/kde-config.cpp.in:189
+#: tdecore/kde-config.cpp.in:189
 msgid "XDG Menu layout (.menu files)"
 msgstr ""
 
-#: 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 ""
 
-#: kdecore/kde-config.cpp.in:203
+#: tdecore/kde-config.cpp.in:203
 #, fuzzy
 msgid ""
 "%1 - unknown type\n"
 msgstr "Math anhysbys"
 
-#: 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-cy/messages/kdelibs/kdelibs_colors.po b/tde-i18n-cy/messages/kdelibs/kdelibs_colors.po
index 299f3faf93b..900f813642e 100644
--- a/tde-i18n-cy/messages/kdelibs/kdelibs_colors.po
+++ b/tde-i18n-cy/messages/kdelibs/kdelibs_colors.po
@@ -1,11 +1,11 @@
-# translation of kdelibs_colors.po to Cymraeg
+# translation of tdelibs_colors.po to Cymraeg
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # Kyfieithu <kyfieithu@dotmon.com>, 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: 2004-09-06 10:40+0100\n"
 "Last-Translator: Kyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/kdeprint.po b/tde-i18n-cy/messages/kdelibs/kdeprint.po
index 4085e83c905..9c0420828f7 100644
--- a/tde-i18n-cy/messages/kdelibs/kdeprint.po
+++ b/tde-i18n-cy/messages/kdelibs/kdeprint.po
@@ -1,5 +1,5 @@
-# translation of kdeprint.po to Cymraeg
-# Translation of kdelibs.po to Cymraeg
+# translation of tdeprint.po to Cymraeg
+# Translation of tdelibs.po to Cymraeg
 # Translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzy.po to Cymraeg
@@ -14,7 +14,7 @@
 #
 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: 2004-08-19 09:54+0100\n"
 "Last-Translator: Kyfieithu <kyfieithu@dotmon.com>\n"
@@ -2886,7 +2886,7 @@ msgstr "Methu canfod y dudalen a ofynnwyd amdani."
 msgid "&Finish"
 msgstr "&Gorffen"
 
-#: management/kdeprint_management_module.cpp:48
+#: management/tdeprint_management_module.cpp:48
 msgid "Select Command"
 msgstr "Dewis Gorchymyn"
 
@@ -4718,7 +4718,7 @@ msgstr "Cynhyrchu data argraffu: tudalen %1"
 msgid "Previewing..."
 msgstr "Rhagolygu..."
 
-#: 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>"
@@ -4790,11 +4790,11 @@ msgstr "Ciw argraffydd pell ar %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 ""
-"Canfuwyd ffeil share/kdeprint/specials.desktop yn eich cyfeiriadur lleol KDE.  "
+"Canfuwyd ffeil share/tdeprint/specials.desktop yn eich cyfeiriadur lleol KDE.  "
 "Mae'r ffeil yma yn dod o ryddhâd cynt o KDE, mwy na thebyg, a dylai ei waredu "
 "er mwyn rheoli ffug-argraffyddion  eang."
 
@@ -4824,10 +4824,10 @@ msgstr "Methu cychwyn proses argraffu plentyn."
 
 #: 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 ""
-"Methu cysylltu â'r gweinydd argraffu KDE (<b>kdeprintd</b>"
+"Methu cysylltu â'r gweinydd argraffu KDE (<b>tdeprintd</b>"
 "). Cywirwch fod y gweinydd yma yn rhedeg."
 
 #: kprinterimpl.cpp:283
@@ -5257,7 +5257,7 @@ msgstr "Terfyniad proses anarferol  (<b>%1</b>)."
 msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
 msgstr "<b>%1</b>: methodd gweithrediad efo'r neges:<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 "
@@ -5268,21 +5268,21 @@ msgstr ""
 "sydd wedi mewngofnodi.  I fynd ymlaen efo argraffu, rhaid i chi ddarparu "
 "cyfrinair gwraidd. "
 
-#: kdeprintd.cpp:181
+#: tdeprintd.cpp:181
 #, fuzzy
 msgid "Provide root's Password"
 msgstr "Darparu cyfrinair gwraidd"
 
-#: kdeprintd.cpp:200 kdeprintd.cpp:202
+#: tdeprintd.cpp:200 tdeprintd.cpp:202
 #, c-format
 msgid "Printing Status - %1"
 msgstr "Cyflwr Argraffu - %1"
 
-#: kdeprintd.cpp:263
+#: tdeprintd.cpp:263
 msgid "Printing system"
 msgstr " Cysawd argraffu"
 
-#: kdeprintd.cpp:266
+#: tdeprintd.cpp:266
 msgid "Authentication failed (user name=%1)"
 msgstr "Methodd y dilysiant (enw'r defnyddiwr=%1)"
 
@@ -10467,7 +10467,7 @@ msgstr "E&raill"
 
 #~ 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 thd@kde.org and coolo@kde.org, 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 "TwoForms"
 
 #~ msgid ""
diff --git a/tde-i18n-cy/messages/kdelibs/kio.po b/tde-i18n-cy/messages/kdelibs/kio.po
index 88649a18301..8ef3f075953 100644
--- a/tde-i18n-cy/messages/kdelibs/kio.po
+++ b/tde-i18n-cy/messages/kdelibs/kio.po
@@ -1,5 +1,5 @@
 # translation of kio.po to Cymraeg
-# Translation of kdelibs.po to Cymraeg
+# Translation of tdelibs.po to Cymraeg
 # Translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzy.po to Cymraeg
@@ -8462,7 +8462,7 @@ msgstr "Dim meta-wybodaeth am %1 "
 
 #~ 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 thd@kde.org and coolo@kde.org, 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 "TwoForms"
 
 #~ msgid ""
@@ -10733,8 +10733,8 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "No plugin information available"
 #~ msgstr "Dim gwybodaeth ategyn ar gael."
 
-#~ msgid "A file share/kdeprint/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 "Canfuwyd ffeil share/kdeprint/specials.desktop yn eich cyfeiriadur lleol KDE.  Mae'r ffeil yma yn dod o ryddhâd cynt o KDE, mwy na thebyg, a dylai ei waredu er mwyn rheoli ffug-argraffyddion  eang."
+#~ msgid "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 "Canfuwyd ffeil share/tdeprint/specials.desktop yn eich cyfeiriadur lleol KDE.  Mae'r ffeil yma yn dod o ryddhâd cynt o KDE, mwy na thebyg, a dylai ei waredu er mwyn rheoli ffug-argraffyddion  eang."
 
 #~ msgid "Margins"
 #~ msgstr "Ymylon"
@@ -10754,8 +10754,8 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "Unable to start child print process. "
 #~ msgstr "Methu cychwyn proses argraffu plentyn."
 
-#~ msgid "The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running."
-#~ msgstr "Methu cysylltu â'r gweinydd argraffu KDE (<b>kdeprintd</b>). Cywirwch fod y gweinydd yma yn rhedeg."
+#~ msgid "The KDE print server (<b>tdeprintd</b>) could not be contacted. Check that this server is running."
+#~ msgstr "Methu cysylltu â'r gweinydd argraffu KDE (<b>tdeprintd</b>). Cywirwch fod y gweinydd yma yn rhedeg."
 
 #~ msgid ""
 #~ "_: 1 is the command that <files> is given to\n"
diff --git a/tde-i18n-cy/messages/kdelibs/kio_help.po b/tde-i18n-cy/messages/kdelibs/kio_help.po
index 3702ecf5fdd..9d567ad8026 100644
--- a/tde-i18n-cy/messages/kdelibs/kio_help.po
+++ b/tde-i18n-cy/messages/kdelibs/kio_help.po
@@ -92,8 +92,8 @@ msgstr "creu ffeil celc i'r ddogfen"
 
 #: meinproc.cpp:81
 #, fuzzy
-msgid "Set the srcdir, for kdelibs"
-msgstr "gosod y srcdir, am kdelibs"
+msgid "Set the srcdir, for tdelibs"
+msgstr "gosod y srcdir, am tdelibs"
 
 #: meinproc.cpp:82
 msgid "Parameters to pass to the stylesheet"
diff --git a/tde-i18n-cy/messages/kdelibs/kstyle_highcontrast_config.po b/tde-i18n-cy/messages/kdelibs/kstyle_highcontrast_config.po
index 2f3178c1fe7..c92e2eaabdb 100644
--- a/tde-i18n-cy/messages/kdelibs/kstyle_highcontrast_config.po
+++ b/tde-i18n-cy/messages/kdelibs/kstyle_highcontrast_config.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../../cy/messages//kdelibs/kstyle_highcontrast_config.po\n"
+"Project-Id-Version: ../../cy/messages//tdelibs/kstyle_highcontrast_config.po\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/ktexteditor_autobookmarker.po b/tde-i18n-cy/messages/kdelibs/ktexteditor_autobookmarker.po
index be1132abd5d..2e811dfc941 100644
--- a/tde-i18n-cy/messages/kdelibs/ktexteditor_autobookmarker.po
+++ b/tde-i18n-cy/messages/kdelibs/ktexteditor_autobookmarker.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdelibs/ktexteditor_autobookmarker.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/ktexteditor_autobookmarker.po\n"
 "POT-Creation-Date: 2005-06-14 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/ktexteditor_docwordcompletion.po b/tde-i18n-cy/messages/kdelibs/ktexteditor_docwordcompletion.po
index b00c2b0ec83..5c4092df889 100644
--- a/tde-i18n-cy/messages/kdelibs/ktexteditor_docwordcompletion.po
+++ b/tde-i18n-cy/messages/kdelibs/ktexteditor_docwordcompletion.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdelibs/ktexteditor_docwordcompletion.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/ktexteditor_docwordcompletion.po\n"
 "POT-Creation-Date: 2007-02-18 02:38+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdelibs/libkscreensaver.po b/tde-i18n-cy/messages/kdelibs/libkscreensaver.po
index de6bda9ea01..02c5b898f79 100644
--- a/tde-i18n-cy/messages/kdelibs/libkscreensaver.po
+++ b/tde-i18n-cy/messages/kdelibs/libkscreensaver.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdelibs/libkscreensaver.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/libkscreensaver.po\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-05-08 21:25+0000\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/Makefile.in b/tde-i18n-cy/messages/kdemultimedia/Makefile.in
index 6d6d15e99a8..caf160124e4 100644
--- a/tde-i18n-cy/messages/kdemultimedia/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdemultimedia/artsbuilder.po b/tde-i18n-cy/messages/kdemultimedia/artsbuilder.po
index 88185776cca..4aa656b788a 100644
--- a/tde-i18n-cy/messages/kdemultimedia/artsbuilder.po
+++ b/tde-i18n-cy/messages/kdemultimedia/artsbuilder.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/artsbuilder.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/artsbuilder.po\n"
 "POT-Creation-Date: 2005-07-24 01:37+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/artscontrol.po b/tde-i18n-cy/messages/kdemultimedia/artscontrol.po
index 07f370bebc9..b6dcc0488e5 100644
--- a/tde-i18n-cy/messages/kdemultimedia/artscontrol.po
+++ b/tde-i18n-cy/messages/kdemultimedia/artscontrol.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/artscontrol.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/artscontrol.po\n"
 "POT-Creation-Date: 2005-01-08 01:21+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/juk.po b/tde-i18n-cy/messages/kdemultimedia/juk.po
index 53c3c1bb623..c23fa722764 100644
--- a/tde-i18n-cy/messages/kdemultimedia/juk.po
+++ b/tde-i18n-cy/messages/kdemultimedia/juk.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/juk.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/juk.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kaboodle.po b/tde-i18n-cy/messages/kdemultimedia/kaboodle.po
index 7a14558649b..73ed1729fc8 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kaboodle.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kaboodle.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kaboodle.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kaboodle.po\n"
 "POT-Creation-Date: 2005-01-24 01:34+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kaudiocreator.po b/tde-i18n-cy/messages/kdemultimedia/kaudiocreator.po
index 2e337a77d03..164cdcc1727 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kaudiocreator.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kaudiocreator.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kaudiocreator.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kaudiocreator.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kcmaudiocd.po b/tde-i18n-cy/messages/kdemultimedia/kcmaudiocd.po
index 61b839577d3..8e77d93a67e 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kcmaudiocd.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kcmaudiocd.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kcmaudiocd.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kcmaudiocd.po\n"
 "POT-Creation-Date: 2007-03-26 02:15+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kcmcddb.po b/tde-i18n-cy/messages/kdemultimedia/kcmcddb.po
index 773173b17ff..6861c512a5c 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kcmcddb.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kcmcddb.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kcmcddb.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kcmcddb.po\n"
 "POT-Creation-Date: 2005-01-31 01:32+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_au.po b/tde-i18n-cy/messages/kdemultimedia/kfile_au.po
index 117214481d7..f2f3c628a9e 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_au.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_au.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_au.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_au.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_avi.po b/tde-i18n-cy/messages/kdemultimedia/kfile_avi.po
index 582ee9612e7..ad2cca1862f 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_avi.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_avi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_avi.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_avi.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_flac.po b/tde-i18n-cy/messages/kdemultimedia/kfile_flac.po
index 8fc2fdc209a..8462bbfc91e 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_flac.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_flac.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_flac.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_flac.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_m3u.po b/tde-i18n-cy/messages/kdemultimedia/kfile_m3u.po
index 324296f8d83..b92a62f33a7 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_m3u.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_m3u.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_m3u.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_m3u.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_mp3.po b/tde-i18n-cy/messages/kdemultimedia/kfile_mp3.po
index 8e56f0f315c..d28074e2a69 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_mp3.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_mp3.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_mp3.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_mp3.po\n"
 "POT-Creation-Date: 2005-05-26 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_mpc.po b/tde-i18n-cy/messages/kdemultimedia/kfile_mpc.po
index e519137ce5f..c1c0245f7f4 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_mpc.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_mpc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_mpc.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_mpc.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_ogg.po b/tde-i18n-cy/messages/kdemultimedia/kfile_ogg.po
index 5bbc8064cba..e3bb3c58698 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_ogg.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_ogg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_ogg.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_ogg.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_sid.po b/tde-i18n-cy/messages/kdemultimedia/kfile_sid.po
index 61d1e8b5f0b..db8d7855158 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_sid.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_sid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_sid.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_sid.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kfile_wav.po b/tde-i18n-cy/messages/kdemultimedia/kfile_wav.po
index 916900311e7..682979e8933 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kfile_wav.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kfile_wav.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kfile_wav.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_wav.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kio_audiocd.po b/tde-i18n-cy/messages/kdemultimedia/kio_audiocd.po
index 04806051a96..51f9d6024af 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kio_audiocd.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kio_audiocd.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kio_audiocd.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kio_audiocd.po\n"
 "POT-Creation-Date: 2007-01-19 02:40+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kmid.po b/tde-i18n-cy/messages/kdemultimedia/kmid.po
index eac0d7bebdb..c6d26a8af64 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kmid.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kmid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kmid.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kmid.po\n"
 "POT-Creation-Date: 2005-08-24 02:38+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/kmix.po b/tde-i18n-cy/messages/kdemultimedia/kmix.po
index e7a1e8646fb..1788808a6b6 100644
--- a/tde-i18n-cy/messages/kdemultimedia/kmix.po
+++ b/tde-i18n-cy/messages/kdemultimedia/kmix.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/kmix.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/kmix.po\n"
 "POT-Creation-Date: 2008-08-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/krec.po b/tde-i18n-cy/messages/kdemultimedia/krec.po
index ad59b08c5f5..1273f65161e 100644
--- a/tde-i18n-cy/messages/kdemultimedia/krec.po
+++ b/tde-i18n-cy/messages/kdemultimedia/krec.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/krec.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/krec.po\n"
 "POT-Creation-Date: 2006-08-20 04:11+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -431,7 +431,7 @@ 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."
diff --git a/tde-i18n-cy/messages/kdemultimedia/libkcddb.po b/tde-i18n-cy/messages/kdemultimedia/libkcddb.po
index f8b54700a46..e523cffbef1 100644
--- a/tde-i18n-cy/messages/kdemultimedia/libkcddb.po
+++ b/tde-i18n-cy/messages/kdemultimedia/libkcddb.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/libkcddb.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/libkcddb.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdemultimedia/noatun.po b/tde-i18n-cy/messages/kdemultimedia/noatun.po
index 2fe5656576f..8f96a40caa4 100644
--- a/tde-i18n-cy/messages/kdemultimedia/noatun.po
+++ b/tde-i18n-cy/messages/kdemultimedia/noatun.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdemultimedia/noatun.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/noatun.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdenetwork/Makefile.in b/tde-i18n-cy/messages/kdenetwork/Makefile.in
index 2be16aaa844..31597baf3b5 100644
--- a/tde-i18n-cy/messages/kdenetwork/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdenetwork/kfileshare.po b/tde-i18n-cy/messages/kdenetwork/kfileshare.po
index d8782cde48f..40e140e23b8 100644
--- a/tde-i18n-cy/messages/kdenetwork/kfileshare.po
+++ b/tde-i18n-cy/messages/kdenetwork/kfileshare.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdenetwork/kfileshare.po\n"
+"Project-Id-Version: ../cy/messages//tdenetwork/kfileshare.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/Makefile.in b/tde-i18n-cy/messages/kdepim/Makefile.in
index e61d915d614..dddd5613821 100644
--- a/tde-i18n-cy/messages/kdepim/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = libkdepim.po kfile_rfc822.po kres_blogging.po karm.po kres_xmlrpc.po kandy.po ktnef.po kfile_vcf.po kdepimwizards.po kres_remote.po kdgantt.po libksync.po kabc2mutt.po kwatchgnupg.po kontact.po kabc_slox.po kleopatra.po kres_featureplan.po kfile_ics.po konsolekalendar.po kres_exchange.po kcmkabconfig.po knode.po kmail.po libksieve.po kio_imap4.po kfile_palm.po konnector_kabc.po kres_tvanytime.po korganizer.po kres_groupware.po libkpimexchange.po kcmkontactnt.po konnector_remote.po multisynk.po kio_mobile.po kres_groupwise.po konnector_dummy.po konnector_kcal.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 konnector_qtopia.po kio_groupwise.po korn.po kaddressbook.po libkholidays.po kio_sieve.po kres_kolab.po libkpgp.po konnector_local.po kmailcvt.po kgantt.po
-GMOFILES = libkdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo ktnef.gmo kfile_vcf.gmo kdepimwizards.gmo kres_remote.gmo kdgantt.gmo libksync.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo konnector_kabc.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo konnector_remote.gmo multisynk.gmo kio_mobile.gmo kres_groupwise.gmo konnector_dummy.gmo konnector_kcal.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 konnector_qtopia.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo konnector_local.gmo kmailcvt.gmo kgantt.gmo
+POFILES = libtdepim.po kfile_rfc822.po kres_blogging.po karm.po kres_xmlrpc.po kandy.po ktnef.po kfile_vcf.po tdepimwizards.po kres_remote.po kdgantt.po libksync.po kabc2mutt.po kwatchgnupg.po kontact.po kabc_slox.po kleopatra.po kres_featureplan.po kfile_ics.po konsolekalendar.po kres_exchange.po kcmkabconfig.po knode.po kmail.po libksieve.po kio_imap4.po kfile_palm.po konnector_kabc.po kres_tvanytime.po korganizer.po kres_groupware.po libkpimexchange.po kcmkontactnt.po konnector_remote.po multisynk.po kio_mobile.po kres_groupwise.po konnector_dummy.po konnector_kcal.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 konnector_qtopia.po kio_groupwise.po korn.po kaddressbook.po libkholidays.po kio_sieve.po kres_kolab.po libkpgp.po konnector_local.po kmailcvt.po kgantt.po
+GMOFILES = libtdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo ktnef.gmo kfile_vcf.gmo tdepimwizards.gmo kres_remote.gmo kdgantt.gmo libksync.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo konnector_kabc.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo konnector_remote.gmo multisynk.gmo kio_mobile.gmo kres_groupwise.gmo konnector_dummy.gmo konnector_kcal.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 konnector_qtopia.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo konnector_local.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 kio_mobile.po kio_sieve.po akregator.po kres_birthday.po ktnef.po kandy.po kres_remote.po kdepimresources.po libksync.po kio_groupwise.po kres_tvanytime.po kfile_vcf.po kres_groupware.po kwatchgnupg.po korn.po korganizer.po kdgantt.po konnector_dummy.po kcmkontactnt.po multisynk.po kres_groupwise.po Makefile.in kres_exchange.po kfile_palm.po kmail_text_vcard_plugin.po kleopatra.po libkholidays.po libkdepim.po konnector_qtopia.po kres_featureplan.po libksieve.po libkpimexchange.po kabc2mutt.po kres_kolab.po konnector_kcal.po kontact.po libkmime.po kdepimwizards.po knotes.po kaddressbook.po kres_blogging.po kmobile.po kcmkabconfig.po kmailcvt.po konnector_local.po kres_xmlrpc.po kpilot.po konnector_kabc.po kmail_text_calendar_plugin.po kfile_ics.po libkleopatra.po kabc_slox.po libkcal.po kfile_rfc822.po kmail.po konnector_remote.po kalarm.po kio_imap4.po libkpgp.po Makefile.am 
+KDE_DIST=knode.po konsolekalendar.po karm.po kgantt.po kio_mobile.po kio_sieve.po akregator.po kres_birthday.po ktnef.po kandy.po kres_remote.po tdepimresources.po libksync.po kio_groupwise.po kres_tvanytime.po kfile_vcf.po kres_groupware.po kwatchgnupg.po korn.po korganizer.po kdgantt.po konnector_dummy.po kcmkontactnt.po multisynk.po kres_groupwise.po Makefile.in kres_exchange.po kfile_palm.po kmail_text_vcard_plugin.po kleopatra.po libkholidays.po libtdepim.po konnector_qtopia.po kres_featureplan.po libksieve.po libkpimexchange.po kabc2mutt.po kres_kolab.po konnector_kcal.po kontact.po libkmime.po tdepimwizards.po knotes.po kaddressbook.po kres_blogging.po kmobile.po kcmkabconfig.po kmailcvt.po konnector_local.po kres_xmlrpc.po kpilot.po konnector_kabc.po kmail_text_calendar_plugin.po kfile_ics.po libkleopatra.po kabc_slox.po libkcal.po kfile_rfc822.po kmail.po konnector_remote.po kalarm.po kio_imap4.po libkpgp.po Makefile.am 
 
 #>+ 187
-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
@@ -558,9 +558,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
@@ -663,9 +663,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
@@ -723,12 +723,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 ktnef.gmo kfile_vcf.gmo kdepimwizards.gmo kres_remote.gmo kdgantt.gmo libksync.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo konnector_kabc.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo konnector_remote.gmo multisynk.gmo kio_mobile.gmo kres_groupwise.gmo konnector_dummy.gmo konnector_kcal.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 konnector_qtopia.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo konnector_local.gmo kmailcvt.gmo kgantt.gmo
+	-rm -f  libtdepim.gmo kfile_rfc822.gmo kres_blogging.gmo karm.gmo kres_xmlrpc.gmo kandy.gmo ktnef.gmo kfile_vcf.gmo tdepimwizards.gmo kres_remote.gmo kdgantt.gmo libksync.gmo kabc2mutt.gmo kwatchgnupg.gmo kontact.gmo kabc_slox.gmo kleopatra.gmo kres_featureplan.gmo kfile_ics.gmo konsolekalendar.gmo kres_exchange.gmo kcmkabconfig.gmo knode.gmo kmail.gmo libksieve.gmo kio_imap4.gmo kfile_palm.gmo konnector_kabc.gmo kres_tvanytime.gmo korganizer.gmo kres_groupware.gmo libkpimexchange.gmo kcmkontactnt.gmo konnector_remote.gmo multisynk.gmo kio_mobile.gmo kres_groupwise.gmo konnector_dummy.gmo konnector_kcal.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 konnector_qtopia.gmo kio_groupwise.gmo korn.gmo kaddressbook.gmo libkholidays.gmo kio_sieve.gmo kres_kolab.gmo libkpgp.gmo konnector_local.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 ktnef kfile_vcf kdepimwizards kres_remote kdgantt libksync kabc2mutt kwatchgnupg kontact kabc_slox kleopatra kres_featureplan kfile_ics konsolekalendar kres_exchange kcmkabconfig knode kmail libksieve kio_imap4 kfile_palm konnector_kabc kres_tvanytime korganizer kres_groupware libkpimexchange kcmkontactnt konnector_remote multisynk kio_mobile kres_groupwise konnector_dummy konnector_kcal kres_birthday libkleopatra kpilot kmail_text_calendar_plugin kdepimresources knotes libkmime akregator kmail_text_vcard_plugin libkcal kmobile kalarm konnector_qtopia kio_groupwise korn kaddressbook libkholidays kio_sieve kres_kolab libkpgp konnector_local kmailcvt kgantt ; do \
+	@for base in libtdepim kfile_rfc822 kres_blogging karm kres_xmlrpc kandy ktnef kfile_vcf tdepimwizards kres_remote kdgantt libksync kabc2mutt kwatchgnupg kontact kabc_slox kleopatra kres_featureplan kfile_ics konsolekalendar kres_exchange kcmkabconfig knode kmail libksieve kio_imap4 kfile_palm konnector_kabc kres_tvanytime korganizer kres_groupware libkpimexchange kcmkontactnt konnector_remote multisynk kio_mobile kres_groupwise konnector_dummy konnector_kcal kres_birthday libkleopatra kpilot kmail_text_calendar_plugin tdepimresources knotes libkmime akregator kmail_text_vcard_plugin libkcal kmobile kalarm konnector_qtopia kio_groupwise korn kaddressbook libkholidays kio_sieve kres_kolab libkpgp konnector_local 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 ;\
@@ -738,7 +738,7 @@ install-nls:
 
 #>+ 64
 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
@@ -746,7 +746,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kandy.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/libksync.mo
@@ -781,7 +781,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
@@ -826,10 +826,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-cy/messages/kdepim/kabc_slox.po b/tde-i18n-cy/messages/kdepim/kabc_slox.po
index 2acb6bfdc15..81ac937eadf 100644
--- a/tde-i18n-cy/messages/kdepim/kabc_slox.po
+++ b/tde-i18n-cy/messages/kdepim/kabc_slox.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kabc_slox.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kabc_slox.po\n"
 "POT-Creation-Date: 2006-05-17 04:02+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kcmkontactnt.po b/tde-i18n-cy/messages/kdepim/kcmkontactnt.po
index 2b2a4a7f25b..18428cf61c3 100644
--- a/tde-i18n-cy/messages/kdepim/kcmkontactnt.po
+++ b/tde-i18n-cy/messages/kdepim/kcmkontactnt.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kcmkontactnt.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kcmkontactnt.po\n"
 "POT-Creation-Date: 2006-03-20 03:58+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kdepimwizards.po b/tde-i18n-cy/messages/kdepim/kdepimwizards.po
index ecb2d0c7d92..54df34d3231 100644
--- a/tde-i18n-cy/messages/kdepim/kdepimwizards.po
+++ b/tde-i18n-cy/messages/kdepim/kdepimwizards.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kdepimwizards.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/tdepimwizards.po\n"
 "POT-Creation-Date: 2008-01-26 01:19+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kfile_ics.po b/tde-i18n-cy/messages/kdepim/kfile_ics.po
index 55fb4626627..c4b62d1b158 100644
--- a/tde-i18n-cy/messages/kdepim/kfile_ics.po
+++ b/tde-i18n-cy/messages/kdepim/kfile_ics.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kfile_ics.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kfile_ics.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kfile_palm.po b/tde-i18n-cy/messages/kdepim/kfile_palm.po
index 5d12d2f7d38..2baef198d73 100644
--- a/tde-i18n-cy/messages/kdepim/kfile_palm.po
+++ b/tde-i18n-cy/messages/kdepim/kfile_palm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kfile_palm.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kfile_palm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kio_imap4.po b/tde-i18n-cy/messages/kdepim/kio_imap4.po
index 522b0c2ac69..c0ac3fcc9b1 100644
--- a/tde-i18n-cy/messages/kdepim/kio_imap4.po
+++ b/tde-i18n-cy/messages/kdepim/kio_imap4.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kio_imap4.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kio_imap4.po\n"
 "POT-Creation-Date: 2008-01-26 01:19+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kleopatra.po b/tde-i18n-cy/messages/kdepim/kleopatra.po
index 6d89b91ae42..8892fa9b9cd 100644
--- a/tde-i18n-cy/messages/kdepim/kleopatra.po
+++ b/tde-i18n-cy/messages/kdepim/kleopatra.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kleopatra.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kleopatra.po\n"
 "POT-Creation-Date: 2008-08-19 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kmail.po b/tde-i18n-cy/messages/kdepim/kmail.po
index c1ad9a94ec0..0e88644f140 100644
--- a/tde-i18n-cy/messages/kdepim/kmail.po
+++ b/tde-i18n-cy/messages/kdepim/kmail.po
@@ -15416,8 +15416,8 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
 #~ msgstr "<qt>Mae'r cyfeiriad ebost <b>%1</b> eisoes yn eich llyfr cyfeiriadau.</qt>"
 
-#~ msgid "No external address book application found. You might want to install KAddressBook from the kdepim module."
-#~ msgstr "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod KLlyfrCyfeiriadau o'r modiwl kdepim."
+#~ msgid "No external address book application found. You might want to install KAddressBook from the tdepim module."
+#~ msgstr "Ni chanfuwyd cymhwysiad llyfr cyfeiriadau allanol.  Efallai hoffech osod KLlyfrCyfeiriadau o'r modiwl tdepim."
 
 #~ msgid "The VCard was added to your addressbook. You can add more information to this entry by opening the addressbook."
 #~ msgstr "Ychwanegwyd y VCard i'ch llyfr cyfeiriadau.  Gallwch ychwanegu mwy o wybodaeth i'r cofnod yma gan agor y llyfr cyfeiriadau."
diff --git a/tde-i18n-cy/messages/kdepim/kmail_text_calendar_plugin.po b/tde-i18n-cy/messages/kdepim/kmail_text_calendar_plugin.po
index ae9dd086ca9..afd7c4763d3 100644
--- a/tde-i18n-cy/messages/kdepim/kmail_text_calendar_plugin.po
+++ b/tde-i18n-cy/messages/kdepim/kmail_text_calendar_plugin.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kmail_text_calendar_plugin.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kmail_text_calendar_plugin.po\n"
 "POT-Creation-Date: 2008-08-19 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kpilot.po b/tde-i18n-cy/messages/kdepim/kpilot.po
index 5fa8e4c14d5..d845ec63e47 100644
--- a/tde-i18n-cy/messages/kdepim/kpilot.po
+++ b/tde-i18n-cy/messages/kdepim/kpilot.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kpilot.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kpilot.po\n"
 "POT-Creation-Date: 2008-07-08 01:23+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -307,7 +307,7 @@ msgid "%1 Conduit"
 msgstr ""
 
 #: lib/plugin.cc:144
-msgid "Send questions and comments to kdepim-users@kde.org"
+msgid "Send questions and comments to tdepim-users@kde.org"
 msgstr ""
 
 #: lib/plugin.cc:194
@@ -1842,7 +1842,7 @@ msgstr ""
 #: 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 ""
 
 #: kpilot/datebookWidget.cc:58 kpilot/dbviewerWidget.cc:109
@@ -2080,7 +2080,7 @@ msgstr ""
 #: 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 ""
 
 #: kpilot/dbAppInfoEditor.cc:86
@@ -2513,7 +2513,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 ""
 
 #: kpilot/internalEditorAction.cc:315
diff --git a/tde-i18n-cy/messages/kdepim/kres_exchange.po b/tde-i18n-cy/messages/kdepim/kres_exchange.po
index b06b0ae6f71..17bd1a7543c 100644
--- a/tde-i18n-cy/messages/kdepim/kres_exchange.po
+++ b/tde-i18n-cy/messages/kdepim/kres_exchange.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kres_exchange.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kres_exchange.po\n"
 "POT-Creation-Date: 2006-03-25 04:00+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kres_remote.po b/tde-i18n-cy/messages/kdepim/kres_remote.po
index 47b6b704484..291567115ab 100644
--- a/tde-i18n-cy/messages/kdepim/kres_remote.po
+++ b/tde-i18n-cy/messages/kdepim/kres_remote.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kres_remote.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kres_remote.po\n"
 "POT-Creation-Date: 2007-01-26 02:44+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kres_xmlrpc.po b/tde-i18n-cy/messages/kdepim/kres_xmlrpc.po
index 8a6e10f3018..b40d6431c38 100644
--- a/tde-i18n-cy/messages/kdepim/kres_xmlrpc.po
+++ b/tde-i18n-cy/messages/kdepim/kres_xmlrpc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kres_xmlrpc.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kres_xmlrpc.po\n"
 "POT-Creation-Date: 2006-06-16 04:05+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/kwatchgnupg.po b/tde-i18n-cy/messages/kdepim/kwatchgnupg.po
index 9255bc758aa..bd891f5b8f1 100644
--- a/tde-i18n-cy/messages/kdepim/kwatchgnupg.po
+++ b/tde-i18n-cy/messages/kdepim/kwatchgnupg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/kwatchgnupg.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/kwatchgnupg.po\n"
 "POT-Creation-Date: 2005-07-25 01:39+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdepim/libkdepim.po b/tde-i18n-cy/messages/kdepim/libkdepim.po
index dd734899b94..de49deffe1f 100644
--- a/tde-i18n-cy/messages/kdepim/libkdepim.po
+++ b/tde-i18n-cy/messages/kdepim/libkdepim.po
@@ -1,4 +1,4 @@
-# translation of libkdepim.po to Cymraeg
+# translation of libtdepim.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -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: 2004-01-09 14:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -1825,8 +1825,8 @@ msgstr ""
 #~ msgstr "dim"
 
 #, fuzzy
-#~ msgid "No external address book application found. You might want to install KAddressBook from the kdepim module."
-#~ msgstr "Ni ganfuwyd cymhwysiad llyfr cyfeiriadau allanol. Efallai hoffech sefydlu KAddressBook o'r modwl kdepim."
+#~ msgid "No external address book application found. You might want to install KAddressBook from the tdepim module."
+#~ msgstr "Ni ganfuwyd cymhwysiad llyfr cyfeiriadau allanol. Efallai hoffech sefydlu KAddressBook o'r modwl tdepim."
 
 #~ msgid "Please select the entry which you want to edit."
 #~ msgstr "Dewiswch y gofnod yr hoffech ei golygu os gwelwch yn dda."
diff --git a/tde-i18n-cy/messages/kdepim/libkleopatra.po b/tde-i18n-cy/messages/kdepim/libkleopatra.po
index 2cdc72bfd65..d9b00110c8f 100644
--- a/tde-i18n-cy/messages/kdepim/libkleopatra.po
+++ b/tde-i18n-cy/messages/kdepim/libkleopatra.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdepim/libkleopatra.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/libkleopatra.po\n"
 "POT-Creation-Date: 2008-08-19 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/Makefile.in b/tde-i18n-cy/messages/kdesdk/Makefile.in
index d04463737dd..a36e51a8e49 100644
--- a/tde-i18n-cy/messages/kdesdk/Makefile.in
+++ b/tde-i18n-cy/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 \
@@ -642,10 +642,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-cy/messages/kdesdk/cervisia.po b/tde-i18n-cy/messages/kdesdk/cervisia.po
index 78763c63e11..381bba9e7f3 100644
--- a/tde-i18n-cy/messages/kdesdk/cervisia.po
+++ b/tde-i18n-cy/messages/kdesdk/cervisia.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/cervisia.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/cervisia.po\n"
 "POT-Creation-Date: 2007-09-24 01:15+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/cvsservice.po b/tde-i18n-cy/messages/kdesdk/cvsservice.po
index 00282f87955..b79bd311262 100644
--- a/tde-i18n-cy/messages/kdesdk/cvsservice.po
+++ b/tde-i18n-cy/messages/kdesdk/cvsservice.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/cvsservice.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/cvsservice.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kbabel.po b/tde-i18n-cy/messages/kdesdk/kbabel.po
index 8e82f583d82..95077b94bd6 100644
--- a/tde-i18n-cy/messages/kdesdk/kbabel.po
+++ b/tde-i18n-cy/messages/kdesdk/kbabel.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kbabel.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kbabel.po\n"
 "POT-Creation-Date: 2008-07-08 01:21+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -1992,7 +1992,7 @@ 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 ""
 
diff --git a/tde-i18n-cy/messages/kdesdk/kbugbuster.po b/tde-i18n-cy/messages/kdesdk/kbugbuster.po
index a3b2d201d9d..a34d50b4a6c 100644
--- a/tde-i18n-cy/messages/kdesdk/kbugbuster.po
+++ b/tde-i18n-cy/messages/kdesdk/kbugbuster.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kbugbuster.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kbugbuster.po\n"
 "POT-Creation-Date: 2008-07-08 01:21+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kcachegrind.po b/tde-i18n-cy/messages/kdesdk/kcachegrind.po
index ab572913ff7..a1d5bcae99b 100644
--- a/tde-i18n-cy/messages/kdesdk/kcachegrind.po
+++ b/tde-i18n-cy/messages/kdesdk/kcachegrind.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kcachegrind.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kcachegrind.po\n"
 "POT-Creation-Date: 2008-07-08 01:21+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kfile_cpp.po b/tde-i18n-cy/messages/kdesdk/kfile_cpp.po
index ba43a468c15..c8a0a455697 100644
--- a/tde-i18n-cy/messages/kdesdk/kfile_cpp.po
+++ b/tde-i18n-cy/messages/kdesdk/kfile_cpp.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kfile_cpp.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kfile_cpp.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kfile_diff.po b/tde-i18n-cy/messages/kdesdk/kfile_diff.po
index 5fe81e21d4d..039d43d246c 100644
--- a/tde-i18n-cy/messages/kdesdk/kfile_diff.po
+++ b/tde-i18n-cy/messages/kdesdk/kfile_diff.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kfile_diff.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kfile_diff.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kfile_po.po b/tde-i18n-cy/messages/kdesdk/kfile_po.po
index 72cf320f77d..75e9e0f8668 100644
--- a/tde-i18n-cy/messages/kdesdk/kfile_po.po
+++ b/tde-i18n-cy/messages/kdesdk/kfile_po.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kfile_po.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kfile_po.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kfile_ts.po b/tde-i18n-cy/messages/kdesdk/kfile_ts.po
index 26a07bfe84f..03c550bdfc8 100644
--- a/tde-i18n-cy/messages/kdesdk/kfile_ts.po
+++ b/tde-i18n-cy/messages/kdesdk/kfile_ts.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kfile_ts.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kfile_ts.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kompare.po b/tde-i18n-cy/messages/kdesdk/kompare.po
index 3d2e9189172..91051e9f268 100644
--- a/tde-i18n-cy/messages/kdesdk/kompare.po
+++ b/tde-i18n-cy/messages/kdesdk/kompare.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kompare.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n"
 "POT-Creation-Date: 2007-12-20 01:16+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kstartperf.po b/tde-i18n-cy/messages/kdesdk/kstartperf.po
index 1b4ec46b75f..22227b58b74 100644
--- a/tde-i18n-cy/messages/kdesdk/kstartperf.po
+++ b/tde-i18n-cy/messages/kdesdk/kstartperf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kstartperf.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kstartperf.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/kuiviewer.po b/tde-i18n-cy/messages/kdesdk/kuiviewer.po
index 24f01c13383..4706899976b 100644
--- a/tde-i18n-cy/messages/kdesdk/kuiviewer.po
+++ b/tde-i18n-cy/messages/kdesdk/kuiviewer.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/kuiviewer.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/kuiviewer.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/spy.po b/tde-i18n-cy/messages/kdesdk/spy.po
index 74a706657c6..ebe28746262 100644
--- a/tde-i18n-cy/messages/kdesdk/spy.po
+++ b/tde-i18n-cy/messages/kdesdk/spy.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/spy.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/spy.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdesdk/umbrello.po b/tde-i18n-cy/messages/kdesdk/umbrello.po
index 8b5621f0c05..aed14a5d369 100644
--- a/tde-i18n-cy/messages/kdesdk/umbrello.po
+++ b/tde-i18n-cy/messages/kdesdk/umbrello.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdesdk/umbrello.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/umbrello.po\n"
 "POT-Creation-Date: 2008-07-08 01:21+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdetoys/Makefile.in b/tde-i18n-cy/messages/kdetoys/Makefile.in
index 28837aaea6d..88130f4faff 100644
--- a/tde-i18n-cy/messages/kdetoys/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdeutils/Makefile.in b/tde-i18n-cy/messages/kdeutils/Makefile.in
index e6b1f4bb2a9..a0394051c4f 100644
--- a/tde-i18n-cy/messages/kdeutils/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdeutils/ark.po b/tde-i18n-cy/messages/kdeutils/ark.po
index d1678ec62ed..4e33b18467b 100644
--- a/tde-i18n-cy/messages/kdeutils/ark.po
+++ b/tde-i18n-cy/messages/kdeutils/ark.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/ark.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/ark.po\n"
 "POT-Creation-Date: 2007-11-07 01:15+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -851,7 +851,7 @@ msgstr ""
 #, 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 ""
 
 #. i18n: file ark.kcfg line 9
@@ -976,7 +976,7 @@ msgstr ""
 #, 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 ""
 
diff --git a/tde-i18n-cy/messages/kdeutils/irkick.po b/tde-i18n-cy/messages/kdeutils/irkick.po
index 35d4018e78b..d1cbe8cd461 100644
--- a/tde-i18n-cy/messages/kdeutils/irkick.po
+++ b/tde-i18n-cy/messages/kdeutils/irkick.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/irkick.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/irkick.po\n"
 "POT-Creation-Date: 2005-07-24 01:36+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcalc.po b/tde-i18n-cy/messages/kdeutils/kcalc.po
index 1ef12c0fcf2..e735703b1fd 100644
--- a/tde-i18n-cy/messages/kdeutils/kcalc.po
+++ b/tde-i18n-cy/messages/kdeutils/kcalc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcalc.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcalc.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcharselect.po b/tde-i18n-cy/messages/kdeutils/kcharselect.po
index 1a46c7e8247..a0859209e4c 100644
--- a/tde-i18n-cy/messages/kdeutils/kcharselect.po
+++ b/tde-i18n-cy/messages/kdeutils/kcharselect.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcharselect.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcharselect.po\n"
 "POT-Creation-Date: 2004-12-21 01:21+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcharselectapplet.po b/tde-i18n-cy/messages/kdeutils/kcharselectapplet.po
index 61191495479..286b6b12f59 100644
--- a/tde-i18n-cy/messages/kdeutils/kcharselectapplet.po
+++ b/tde-i18n-cy/messages/kdeutils/kcharselectapplet.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcharselectapplet.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcharselectapplet.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcmkvaio.po b/tde-i18n-cy/messages/kdeutils/kcmkvaio.po
index 4dc22d3b3c7..00cc07efcca 100644
--- a/tde-i18n-cy/messages/kdeutils/kcmkvaio.po
+++ b/tde-i18n-cy/messages/kdeutils/kcmkvaio.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcmkvaio.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcmkvaio.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcmkwallet.po b/tde-i18n-cy/messages/kdeutils/kcmkwallet.po
index 05265dc4819..e74ba305e95 100644
--- a/tde-i18n-cy/messages/kdeutils/kcmkwallet.po
+++ b/tde-i18n-cy/messages/kdeutils/kcmkwallet.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcmkwallet.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcmkwallet.po\n"
 "POT-Creation-Date: 2006-08-23 02:35+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcmlaptop.po b/tde-i18n-cy/messages/kdeutils/kcmlaptop.po
index 7dd916d830e..8f6bcdd8e2a 100644
--- a/tde-i18n-cy/messages/kdeutils/kcmlaptop.po
+++ b/tde-i18n-cy/messages/kdeutils/kcmlaptop.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcmlaptop.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcmlaptop.po\n"
 "POT-Creation-Date: 2006-10-14 02:36+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -601,7 +601,7 @@ msgstr ""
 
 #: 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 ""
 
@@ -658,7 +658,7 @@ msgstr ""
 
 #: 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 ""
 
@@ -880,13 +880,13 @@ msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
diff --git a/tde-i18n-cy/messages/kdeutils/kcmlirc.po b/tde-i18n-cy/messages/kdeutils/kcmlirc.po
index 8f28159844e..c3ccf7784d5 100644
--- a/tde-i18n-cy/messages/kdeutils/kcmlirc.po
+++ b/tde-i18n-cy/messages/kdeutils/kcmlirc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcmlirc.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcmlirc.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kcmthinkpad.po b/tde-i18n-cy/messages/kdeutils/kcmthinkpad.po
index 05f2050232d..c2476cabcb8 100644
--- a/tde-i18n-cy/messages/kdeutils/kcmthinkpad.po
+++ b/tde-i18n-cy/messages/kdeutils/kcmthinkpad.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kcmthinkpad.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kcmthinkpad.po\n"
 "POT-Creation-Date: 2005-09-30 02:48+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kdelirc.po b/tde-i18n-cy/messages/kdeutils/kdelirc.po
index adce4bd7cef..2de47c74b95 100644
--- a/tde-i18n-cy/messages/kdeutils/kdelirc.po
+++ b/tde-i18n-cy/messages/kdeutils/kdelirc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kdelirc.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kdelirc.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kdessh.po b/tde-i18n-cy/messages/kdeutils/kdessh.po
index cca19f00fc5..8d48fd201b3 100644
--- a/tde-i18n-cy/messages/kdeutils/kdessh.po
+++ b/tde-i18n-cy/messages/kdeutils/kdessh.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kdessh.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kdessh.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -75,7 +75,7 @@ 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 ""
 
diff --git a/tde-i18n-cy/messages/kdeutils/kdf.po b/tde-i18n-cy/messages/kdeutils/kdf.po
index 1b7a1f769cb..ead08701d46 100644
--- a/tde-i18n-cy/messages/kdeutils/kdf.po
+++ b/tde-i18n-cy/messages/kdeutils/kdf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kdf.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kdf.po\n"
 "POT-Creation-Date: 2004-12-29 14:54+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kedit.po b/tde-i18n-cy/messages/kdeutils/kedit.po
index 3a2fce2f072..0ce5fef47a3 100644
--- a/tde-i18n-cy/messages/kdeutils/kedit.po
+++ b/tde-i18n-cy/messages/kdeutils/kedit.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kedit.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kedit.po\n"
 "POT-Creation-Date: 2008-07-08 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kfloppy.po b/tde-i18n-cy/messages/kdeutils/kfloppy.po
index 56804b98bfc..e55a25cd466 100644
--- a/tde-i18n-cy/messages/kdeutils/kfloppy.po
+++ b/tde-i18n-cy/messages/kdeutils/kfloppy.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kfloppy.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kfloppy.po\n"
 "POT-Creation-Date: 2007-06-02 02:16+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kgpg.po b/tde-i18n-cy/messages/kdeutils/kgpg.po
index af7fe7ca61e..4da7320a5a1 100644
--- a/tde-i18n-cy/messages/kdeutils/kgpg.po
+++ b/tde-i18n-cy/messages/kdeutils/kgpg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kgpg.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kgpg.po\n"
 "POT-Creation-Date: 2008-07-11 01:32+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/khexedit.po b/tde-i18n-cy/messages/kdeutils/khexedit.po
index f361a05b9cf..4f39fb1da1c 100644
--- a/tde-i18n-cy/messages/kdeutils/khexedit.po
+++ b/tde-i18n-cy/messages/kdeutils/khexedit.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/khexedit.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/khexedit.po\n"
 "POT-Creation-Date: 2006-04-17 03:54+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kjots.po b/tde-i18n-cy/messages/kdeutils/kjots.po
index 60477a44a1a..d2230dd3161 100644
--- a/tde-i18n-cy/messages/kdeutils/kjots.po
+++ b/tde-i18n-cy/messages/kdeutils/kjots.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kjots.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kjots.po\n"
 "POT-Creation-Date: 2007-05-02 02:16+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/klaptopdaemon.po b/tde-i18n-cy/messages/kdeutils/klaptopdaemon.po
index 621037bb53c..be2378eb9e4 100644
--- a/tde-i18n-cy/messages/kdeutils/klaptopdaemon.po
+++ b/tde-i18n-cy/messages/kdeutils/klaptopdaemon.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/klaptopdaemon.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/klaptopdaemon.po\n"
 "POT-Creation-Date: 2008-02-03 01:21+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -355,7 +355,7 @@ msgstr ""
 
 #: 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 ""
 
diff --git a/tde-i18n-cy/messages/kdeutils/kmilo_kvaio.po b/tde-i18n-cy/messages/kdeutils/kmilo_kvaio.po
index 036789b96a4..dd1d434a817 100644
--- a/tde-i18n-cy/messages/kdeutils/kmilo_kvaio.po
+++ b/tde-i18n-cy/messages/kdeutils/kmilo_kvaio.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kmilo_kvaio.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kmilo_kvaio.po\n"
 "POT-Creation-Date: 2005-07-08 01:34+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kmilo_powerbook.po b/tde-i18n-cy/messages/kdeutils/kmilo_powerbook.po
index 5ea61ee9cb2..951b1fe960d 100644
--- a/tde-i18n-cy/messages/kdeutils/kmilo_powerbook.po
+++ b/tde-i18n-cy/messages/kdeutils/kmilo_powerbook.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kmilo_powerbook.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kmilo_powerbook.po\n"
 "POT-Creation-Date: 2005-11-30 03:22+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kmilo_thinkpad.po b/tde-i18n-cy/messages/kdeutils/kmilo_thinkpad.po
index a5133cd313b..7982468a0dd 100644
--- a/tde-i18n-cy/messages/kdeutils/kmilo_thinkpad.po
+++ b/tde-i18n-cy/messages/kdeutils/kmilo_thinkpad.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kmilo_thinkpad.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kmilo_thinkpad.po\n"
 "POT-Creation-Date: 2005-06-14 01:28+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kregexpeditor.po b/tde-i18n-cy/messages/kdeutils/kregexpeditor.po
index 2cb0eb64bb7..41bbbd49b7f 100644
--- a/tde-i18n-cy/messages/kdeutils/kregexpeditor.po
+++ b/tde-i18n-cy/messages/kdeutils/kregexpeditor.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kregexpeditor.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kregexpeditor.po\n"
 "POT-Creation-Date: 2005-08-18 04:29+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/ksim.po b/tde-i18n-cy/messages/kdeutils/ksim.po
index 3adf952d173..f1ce2882b52 100644
--- a/tde-i18n-cy/messages/kdeutils/ksim.po
+++ b/tde-i18n-cy/messages/kdeutils/ksim.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/ksim.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/ksim.po\n"
 "POT-Creation-Date: 2007-05-28 02:15+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/ktimer.po b/tde-i18n-cy/messages/kdeutils/ktimer.po
index 40bd3c1264e..62048ec7869 100644
--- a/tde-i18n-cy/messages/kdeutils/ktimer.po
+++ b/tde-i18n-cy/messages/kdeutils/ktimer.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/ktimer.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/ktimer.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdeutils/kwalletmanager.po b/tde-i18n-cy/messages/kdeutils/kwalletmanager.po
index 55da7de95d5..d89beceb6cf 100644
--- a/tde-i18n-cy/messages/kdeutils/kwalletmanager.po
+++ b/tde-i18n-cy/messages/kdeutils/kwalletmanager.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeutils/kwalletmanager.po\n"
+"Project-Id-Version: ../cy/messages//tdeutils/kwalletmanager.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdevelop/Makefile.in b/tde-i18n-cy/messages/kdevelop/Makefile.in
index 54687e420ad..126d4d044aa 100644
--- a/tde-i18n-cy/messages/kdevelop/Makefile.in
+++ b/tde-i18n-cy/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 = cy
 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-cy/messages/kdevelop/kdevelop.po b/tde-i18n-cy/messages/kdevelop/kdevelop.po
index b403f4445b3..e61f274f03a 100644
--- a/tde-i18n-cy/messages/kdevelop/kdevelop.po
+++ b/tde-i18n-cy/messages/kdevelop/kdevelop.po
@@ -75,7 +75,7 @@ msgstr ""
 msgid "Extra Toolbar"
 msgstr "Bar Offer Ychwanegol"
 
-#. 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"
@@ -2382,7 +2382,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 ""
@@ -2390,27 +2390,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 ""
 
-#. 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 ""
 
-#. 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 ""
@@ -3999,7 +3999,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 ""
 
@@ -4256,7 +4256,7 @@ msgstr ""
 #, 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 ""
 
 #. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
@@ -8099,7 +8099,7 @@ msgstr ""
 #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
 #: rc.cpp:5205
 #, no-c-format
-msgid "Use &kdesu when installing"
+msgid "Use &tdesu when installing"
 msgstr ""
 
 #. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
@@ -15821,7 +15821,7 @@ msgid "Close this view"
 msgstr "Gweithredoedd d&ewisiedig:"
 
 #: languages/cpp/debugger/stty.cpp:333 languages/ruby/debugger/stty.cpp:317
-msgid "kdevelop: Debug application console"
+msgid "tdevelop: Debug application console"
 msgstr ""
 
 #: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
@@ -15830,14 +15830,14 @@ msgid ""
 "Please select a different directory."
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Invalid Directory"
 msgstr "Cyfeiriadur"
 
-#: 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."
@@ -18345,7 +18345,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
@@ -18553,7 +18553,7 @@ msgstr ""
 
 #: src/projectmanager.cpp:133
 msgid ""
-"*.kdevelop|KDevelop 3 Project Files\n"
+"*.tdevelop|KDevelop 3 Project Files\n"
 "*.kdevprj|KDevelop 2 Project Files"
 msgstr ""
 
@@ -18635,7 +18635,7 @@ msgid "Invalid URL."
 msgstr "URL annilys."
 
 #: src/projectmanager.cpp:623
-msgid "You do not have 'kdevprj2kdevelop' installed."
+msgid "You do not have 'kdevprj2tdevelop' installed."
 msgstr ""
 
 #: src/splashscreen.cpp:77
@@ -24370,7 +24370,7 @@ msgstr "Bar offer"
 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
@@ -24852,7 +24852,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
@@ -24863,7 +24863,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
@@ -24874,7 +24874,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
@@ -25036,7 +25036,7 @@ 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 ""
@@ -25831,7 +25831,7 @@ 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 ""
diff --git a/tde-i18n-cy/messages/kdewebdev/Makefile.in b/tde-i18n-cy/messages/kdewebdev/Makefile.in
index 519877e478e..d47dc447b00 100644
--- a/tde-i18n-cy/messages/kdewebdev/Makefile.in
+++ b/tde-i18n-cy/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-cy/messages/kdewebdev/kfilereplace.po b/tde-i18n-cy/messages/kdewebdev/kfilereplace.po
index be96855b020..4508c654717 100644
--- a/tde-i18n-cy/messages/kdewebdev/kfilereplace.po
+++ b/tde-i18n-cy/messages/kdewebdev/kfilereplace.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/kfilereplace.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/kfilereplace.po\n"
 "POT-Creation-Date: 2008-07-08 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdewebdev/kimagemapeditor.po b/tde-i18n-cy/messages/kdewebdev/kimagemapeditor.po
index cef55fa9e94..19a397b9e11 100644
--- a/tde-i18n-cy/messages/kdewebdev/kimagemapeditor.po
+++ b/tde-i18n-cy/messages/kdewebdev/kimagemapeditor.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/kimagemapeditor.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/kimagemapeditor.po\n"
 "POT-Creation-Date: 2007-12-30 01:24+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdewebdev/klinkstatus.po b/tde-i18n-cy/messages/kdewebdev/klinkstatus.po
index 084bf9a1fa7..73bbae1f680 100644
--- a/tde-i18n-cy/messages/kdewebdev/klinkstatus.po
+++ b/tde-i18n-cy/messages/kdewebdev/klinkstatus.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/klinkstatus.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/klinkstatus.po\n"
 "POT-Creation-Date: 2008-08-14 01:19+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -214,7 +214,7 @@ msgstr "kyfieithu@dotmon.com"
 msgid ""
 "A Link Checker.\n"
 "\n"
-"KLinkStatus belongs to the kdewebdev module from KDE."
+"KLinkStatus belongs to the tdewebdev module from KDE."
 msgstr ""
 
 #: main.cpp:40
diff --git a/tde-i18n-cy/messages/kdewebdev/kommander.po b/tde-i18n-cy/messages/kdewebdev/kommander.po
index ab1dd900360..98505725e62 100644
--- a/tde-i18n-cy/messages/kdewebdev/kommander.po
+++ b/tde-i18n-cy/messages/kdewebdev/kommander.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/kommander.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/kommander.po\n"
 "POT-Creation-Date: 2008-07-08 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdewebdev/kxsldbg.po b/tde-i18n-cy/messages/kdewebdev/kxsldbg.po
index 51f38faa8ef..e089b94fe11 100644
--- a/tde-i18n-cy/messages/kdewebdev/kxsldbg.po
+++ b/tde-i18n-cy/messages/kdewebdev/kxsldbg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/kxsldbg.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/kxsldbg.po\n"
 "POT-Creation-Date: 2008-07-08 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/kdewebdev/quanta.po b/tde-i18n-cy/messages/kdewebdev/quanta.po
index ec2f6e0efc6..c5e8fd693f1 100644
--- a/tde-i18n-cy/messages/kdewebdev/quanta.po
+++ b/tde-i18n-cy/messages/kdewebdev/quanta.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdewebdev/quanta.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/quanta.po\n"
 "POT-Creation-Date: 2008-07-08 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -432,7 +432,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 "
@@ -444,7 +444,7 @@ msgstr ""
 #: rc.cpp:229
 #, no-c-format
 msgid ""
-"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
+"<a href=\"http://tdewebdev.org/donate.php\">Donate</a> through  PayPal now."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 25
@@ -4839,7 +4839,7 @@ msgstr "kate"
 #. i18n: file ./scripts/scriptinfo.kmdr line 288
 #: rc.cpp:3214
 #, no-c-format
-msgid "kdevelop"
+msgid "tdevelop"
 msgstr ""
 
 #. i18n: file ./scripts/scriptinfo.kmdr line 303
@@ -4915,8 +4915,8 @@ msgid ""
 "Lead Developer - Andras Mantia <a "
 "href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
 "Kommander - Michal Rudolf <a "
-"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
-"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
+"href=\"mailto:mrudolf@tdewebdev.org?subject=ScriptInfo\">"
+"mrudolf@tdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
 "href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
 "</body></html>\n"
 msgstr ""
@@ -8913,14 +8913,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 ""
@@ -9021,7 +9021,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 ""
@@ -9172,7 +9172,7 @@ msgstr ""
 msgid ""
 "<p>...that you can contribute to <b>Quanta's public repository</b> "
 "of resources? Just <a "
-"href=\"mailto:submissions@kdewebdev.org?subject=Quanta%20Resource\">"
+"href=\"mailto:submissions@tdewebdev.org?subject=Quanta%20Resource\">"
 "email it here</a>.\n"
 "</p>\n"
 msgstr ""
@@ -9379,7 +9379,7 @@ 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 ""
@@ -9462,7 +9462,7 @@ msgstr ""
 #: 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 ""
@@ -10213,7 +10213,7 @@ msgid "comparing of files by content"
 msgstr ""
 
 #: src/quanta_init.cpp:1426
-msgid "Control Center (kdebase)"
+msgid "Control Center (tdebase)"
 msgstr ""
 
 #: src/quanta_init.cpp:1429 src/quanta_init.cpp:1436
@@ -11742,7 +11742,7 @@ 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 ""
@@ -11844,7 +11844,7 @@ 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 ""