18 files changed, 394 insertions, 394 deletions
diff --git a/tde-i18n-es/messages/kdebase/Makefile.in b/tde-i18n-es/messages/kdebase/Makefile.in
index e770f6a6d07..08748f09223 100644
--- a/tde-i18n-es/messages/kdebase/Makefile.in
+++ b/tde-i18n-es/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 = es
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po
-GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmtwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po tdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po tdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po twin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmtwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_tdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po twin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po twin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po tdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po tdeprint_part.po kio_smtp.po
+GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
+KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po twin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po tdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmtwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po twin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in tdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_tdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po twin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmtwinrules.po libdmctl.po krdb.po kio_home.po tdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po tdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
 
 #>+ 469
 kio_sftp.gmo: kio_sftp.po
@@ -573,9 +573,9 @@ kcmlaunch.gmo: kcmlaunch.po
 kcminfo.gmo: kcminfo.po
 	rm -f kcminfo.gmo; $(GMSGFMT) -o kcminfo.gmo $(srcdir)/kcminfo.po
 	test ! -f kcminfo.gmo || touch kcminfo.gmo
-kcmkwinrules.gmo: kcmkwinrules.po
-	rm -f kcmkwinrules.gmo; $(GMSGFMT) -o kcmkwinrules.gmo $(srcdir)/kcmkwinrules.po
-	test ! -f kcmkwinrules.gmo || touch kcmkwinrules.gmo
+kcmtwinrules.gmo: kcmtwinrules.po
+	rm -f kcmtwinrules.gmo; $(GMSGFMT) -o kcmtwinrules.gmo $(srcdir)/kcmtwinrules.po
+	test ! -f kcmtwinrules.gmo || touch kcmtwinrules.gmo
 kasbarextension.gmo: kasbarextension.po
 	rm -f kasbarextension.gmo; $(GMSGFMT) -o kasbarextension.gmo $(srcdir)/kasbarextension.po
 	test ! -f kasbarextension.gmo || touch kasbarextension.gmo
@@ -636,9 +636,9 @@ kio_remote.gmo: kio_remote.po
 kio_home.gmo: kio_home.po
 	rm -f kio_home.gmo; $(GMSGFMT) -o kio_home.gmo $(srcdir)/kio_home.po
 	test ! -f kio_home.gmo || touch kio_home.gmo
-kdeprintfax.gmo: kdeprintfax.po
-	rm -f kdeprintfax.gmo; $(GMSGFMT) -o kdeprintfax.gmo $(srcdir)/kdeprintfax.po
-	test ! -f kdeprintfax.gmo || touch kdeprintfax.gmo
+tdeprintfax.gmo: tdeprintfax.po
+	rm -f tdeprintfax.gmo; $(GMSGFMT) -o tdeprintfax.gmo $(srcdir)/tdeprintfax.po
+	test ! -f tdeprintfax.gmo || touch tdeprintfax.gmo
 kcmicons.gmo: kcmicons.po
 	rm -f kcmicons.gmo; $(GMSGFMT) -o kcmicons.gmo $(srcdir)/kcmicons.po
 	test ! -f kcmicons.gmo || touch kcmicons.gmo
@@ -678,9 +678,9 @@ kaccess.gmo: kaccess.po
 kio_pop3.gmo: kio_pop3.po
 	rm -f kio_pop3.gmo; $(GMSGFMT) -o kio_pop3.gmo $(srcdir)/kio_pop3.po
 	test ! -f kio_pop3.gmo || touch kio_pop3.gmo
-kdesud.gmo: kdesud.po
-	rm -f kdesud.gmo; $(GMSGFMT) -o kdesud.gmo $(srcdir)/kdesud.po
-	test ! -f kdesud.gmo || touch kdesud.gmo
+tdesud.gmo: tdesud.po
+	rm -f tdesud.gmo; $(GMSGFMT) -o tdesud.gmo $(srcdir)/tdesud.po
+	test ! -f tdesud.gmo || touch tdesud.gmo
 kio_fish.gmo: kio_fish.po
 	rm -f kio_fish.gmo; $(GMSGFMT) -o kio_fish.gmo $(srcdir)/kio_fish.po
 	test ! -f kio_fish.gmo || touch kio_fish.gmo
@@ -771,9 +771,9 @@ kcmlayout.gmo: kcmlayout.po
 kpager.gmo: kpager.po
 	rm -f kpager.gmo; $(GMSGFMT) -o kpager.gmo $(srcdir)/kpager.po
 	test ! -f kpager.gmo || touch kpager.gmo
-kwin_clients.gmo: kwin_clients.po
-	rm -f kwin_clients.gmo; $(GMSGFMT) -o kwin_clients.gmo $(srcdir)/kwin_clients.po
-	test ! -f kwin_clients.gmo || touch kwin_clients.gmo
+twin_clients.gmo: twin_clients.po
+	rm -f twin_clients.gmo; $(GMSGFMT) -o twin_clients.gmo $(srcdir)/twin_clients.po
+	test ! -f twin_clients.gmo || touch twin_clients.gmo
 kdebugdialog.gmo: kdebugdialog.po
 	rm -f kdebugdialog.gmo; $(GMSGFMT) -o kdebugdialog.gmo $(srcdir)/kdebugdialog.po
 	test ! -f kdebugdialog.gmo || touch kdebugdialog.gmo
@@ -804,9 +804,9 @@ libkickermenu_remotemenu.gmo: libkickermenu_remotemenu.po
 lockout.gmo: lockout.po
 	rm -f lockout.gmo; $(GMSGFMT) -o lockout.gmo $(srcdir)/lockout.po
 	test ! -f lockout.gmo || touch lockout.gmo
-kcmkwindecoration.gmo: kcmkwindecoration.po
-	rm -f kcmkwindecoration.gmo; $(GMSGFMT) -o kcmkwindecoration.gmo $(srcdir)/kcmkwindecoration.po
-	test ! -f kcmkwindecoration.gmo || touch kcmkwindecoration.gmo
+kcmtwindecoration.gmo: kcmtwindecoration.po
+	rm -f kcmtwindecoration.gmo; $(GMSGFMT) -o kcmtwindecoration.gmo $(srcdir)/kcmtwindecoration.po
+	test ! -f kcmtwindecoration.gmo || touch kcmtwindecoration.gmo
 kxkb.gmo: kxkb.po
 	rm -f kxkb.gmo; $(GMSGFMT) -o kxkb.gmo $(srcdir)/kxkb.po
 	test ! -f kxkb.gmo || touch kxkb.gmo
@@ -831,9 +831,9 @@ kcmnic.gmo: kcmnic.po
 privacy.gmo: privacy.po
 	rm -f privacy.gmo; $(GMSGFMT) -o privacy.gmo $(srcdir)/privacy.po
 	test ! -f privacy.gmo || touch privacy.gmo
-libkickermenu_kdeprint.gmo: libkickermenu_kdeprint.po
-	rm -f libkickermenu_kdeprint.gmo; $(GMSGFMT) -o libkickermenu_kdeprint.gmo $(srcdir)/libkickermenu_kdeprint.po
-	test ! -f libkickermenu_kdeprint.gmo || touch libkickermenu_kdeprint.gmo
+libkickermenu_tdeprint.gmo: libkickermenu_tdeprint.po
+	rm -f libkickermenu_tdeprint.gmo; $(GMSGFMT) -o libkickermenu_tdeprint.gmo $(srcdir)/libkickermenu_tdeprint.po
+	test ! -f libkickermenu_tdeprint.gmo || touch libkickermenu_tdeprint.gmo
 kscreensaver.gmo: kscreensaver.po
 	rm -f kscreensaver.gmo; $(GMSGFMT) -o kscreensaver.gmo $(srcdir)/kscreensaver.po
 	test ! -f kscreensaver.gmo || touch kscreensaver.gmo
@@ -870,9 +870,9 @@ ksystraycmd.gmo: ksystraycmd.po
 kcmsmartcard.gmo: kcmsmartcard.po
 	rm -f kcmsmartcard.gmo; $(GMSGFMT) -o kcmsmartcard.gmo $(srcdir)/kcmsmartcard.po
 	test ! -f kcmsmartcard.gmo || touch kcmsmartcard.gmo
-kwin.gmo: kwin.po
-	rm -f kwin.gmo; $(GMSGFMT) -o kwin.gmo $(srcdir)/kwin.po
-	test ! -f kwin.gmo || touch kwin.gmo
+twin.gmo: twin.po
+	rm -f twin.gmo; $(GMSGFMT) -o twin.gmo $(srcdir)/twin.po
+	test ! -f twin.gmo || touch twin.gmo
 libkicker.gmo: libkicker.po
 	rm -f libkicker.gmo; $(GMSGFMT) -o libkicker.gmo $(srcdir)/libkicker.po
 	test ! -f libkicker.gmo || touch libkicker.gmo
@@ -888,9 +888,9 @@ kgreet_winbind.gmo: kgreet_winbind.po
 drkonqi.gmo: drkonqi.po
 	rm -f drkonqi.gmo; $(GMSGFMT) -o drkonqi.gmo $(srcdir)/drkonqi.po
 	test ! -f drkonqi.gmo || touch drkonqi.gmo
-kwin_lib.gmo: kwin_lib.po
-	rm -f kwin_lib.gmo; $(GMSGFMT) -o kwin_lib.gmo $(srcdir)/kwin_lib.po
-	test ! -f kwin_lib.gmo || touch kwin_lib.gmo
+twin_lib.gmo: twin_lib.po
+	rm -f twin_lib.gmo; $(GMSGFMT) -o twin_lib.gmo $(srcdir)/twin_lib.po
+	test ! -f twin_lib.gmo || touch twin_lib.gmo
 kio_settings.gmo: kio_settings.po
 	rm -f kio_settings.gmo; $(GMSGFMT) -o kio_settings.gmo $(srcdir)/kio_settings.po
 	test ! -f kio_settings.gmo || touch kio_settings.gmo
@@ -906,9 +906,9 @@ kcmscreensaver.gmo: kcmscreensaver.po
 konqueror.gmo: konqueror.po
 	rm -f konqueror.gmo; $(GMSGFMT) -o konqueror.gmo $(srcdir)/konqueror.po
 	test ! -f konqueror.gmo || touch konqueror.gmo
-kdesu.gmo: kdesu.po
-	rm -f kdesu.gmo; $(GMSGFMT) -o kdesu.gmo $(srcdir)/kdesu.po
-	test ! -f kdesu.gmo || touch kdesu.gmo
+tdesu.gmo: tdesu.po
+	rm -f tdesu.gmo; $(GMSGFMT) -o tdesu.gmo $(srcdir)/tdesu.po
+	test ! -f tdesu.gmo || touch tdesu.gmo
 kcmsmserver.gmo: kcmsmserver.po
 	rm -f kcmsmserver.gmo; $(GMSGFMT) -o kcmsmserver.gmo $(srcdir)/kcmsmserver.po
 	test ! -f kcmsmserver.gmo || touch kcmsmserver.gmo
@@ -996,21 +996,21 @@ quicklauncher.gmo: quicklauncher.po
 kcmsamba.gmo: kcmsamba.po
 	rm -f kcmsamba.gmo; $(GMSGFMT) -o kcmsamba.gmo $(srcdir)/kcmsamba.po
 	test ! -f kcmsamba.gmo || touch kcmsamba.gmo
-kdeprint_part.gmo: kdeprint_part.po
-	rm -f kdeprint_part.gmo; $(GMSGFMT) -o kdeprint_part.gmo $(srcdir)/kdeprint_part.po
-	test ! -f kdeprint_part.gmo || touch kdeprint_part.gmo
+tdeprint_part.gmo: tdeprint_part.po
+	rm -f tdeprint_part.gmo; $(GMSGFMT) -o tdeprint_part.gmo $(srcdir)/tdeprint_part.po
+	test ! -f tdeprint_part.gmo || touch tdeprint_part.gmo
 kio_smtp.gmo: kio_smtp.po
 	rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po
 	test ! -f kio_smtp.gmo || touch kio_smtp.gmo
 
 #>+ 3
 clean-nls:
-	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \
+	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmtwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home tdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 tdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager twin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmtwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_tdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard twin libkicker khelpcenter ksmserver kgreet_winbind drkonqi twin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror tdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba tdeprint_part kio_smtp ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -1033,7 +1033,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_keramik_config.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlaunch.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminfo.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwinrules.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwinrules.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kasbarextension.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khtmlkttsd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libdmctl.mo
@@ -1054,7 +1054,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkded.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_remote.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_home.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprintfax.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprintfax.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmicons.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/filetypes.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmenergy.mo
@@ -1068,7 +1068,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktip.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kaccess.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_pop3.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesud.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesud.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_fish.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkdnssd.mo
@@ -1099,7 +1099,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlayout.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpager.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_clients.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_clients.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdebugdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnotify.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_nfs.mo
@@ -1110,7 +1110,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kay.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_remotemenu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/lockout.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwindecoration.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwindecoration.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kxkb.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kprinter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtaskmanager.mo
@@ -1119,7 +1119,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcrypto.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnic.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/privacy.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_kdeprint.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_tdeprint.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkonq.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_recentdocs.mo
@@ -1132,19 +1132,19 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_man.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksystraycmd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmartcard.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khelpcenter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kgreet_winbind.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/drkonqi.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_lib.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_lib.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_settings.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksysguard.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfontinst.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/konqueror.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesu.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcolors.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminput.mo
@@ -1174,7 +1174,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkonqhtml.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/quicklauncher.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprint_part.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo
 
 #>+ 2
@@ -1202,10 +1202,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-es/messages/kdebase/drkonqi.po b/tde-i18n-es/messages/kdebase/drkonqi.po
index 953dcb43803..377c2748349 100644
--- a/tde-i18n-es/messages/kdebase/drkonqi.po
+++ b/tde-i18n-es/messages/kdebase/drkonqi.po
@@ -187,7 +187,7 @@ msgid "Startup ID of the program"
 msgstr "Identificación de inicio del programa."
 
 #: main.cpp:55
-msgid "The program was started by kdeinit"
+msgid "The program was started by tdeinit"
 msgstr "El programa fue iniciado por Kdeinit."
 
 #: main.cpp:56
diff --git a/tde-i18n-es/messages/kdebase/kcmcrypto.po b/tde-i18n-es/messages/kdebase/kcmcrypto.po
index 69a91bda7ab..57d8ea7afae 100644
--- a/tde-i18n-es/messages/kdebase/kcmcrypto.po
+++ b/tde-i18n-es/messages/kdebase/kcmcrypto.po
@@ -716,10 +716,10 @@ msgstr "No permitir disponibilidad"
 
 #: 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 ""
-"No se puede ejecutar Kleopatra. Debe instalar o actualizar el paquete kdepim."
+"No se puede ejecutar Kleopatra. Debe instalar o actualizar el paquete tdepim."
 
 #: crypto.cpp:2030
 msgid ""
diff --git a/tde-i18n-es/messages/kdebase/kcmkeys.po b/tde-i18n-es/messages/kdebase/kcmkeys.po
index 929068f8e47..46a719efca0 100644
--- a/tde-i18n-es/messages/kdebase/kcmkeys.po
+++ b/tde-i18n-es/messages/kdebase/kcmkeys.po
@@ -325,383 +325,383 @@ msgstr ""
 msgid "Application Missing"
 msgstr "Falta la aplicación"
 
-#: ../../kwin/kwinbindings.cpp:18
+#: ../../twin/twinbindings.cpp:18
 msgid "System"
 msgstr "Sistema"
 
-#: ../../kwin/kwinbindings.cpp:20
+#: ../../twin/twinbindings.cpp:20
 msgid "Navigation"
 msgstr "Navegación"
 
-#: ../../kwin/kwinbindings.cpp:21
+#: ../../twin/twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "Circular por las ventanas"
 
-#: ../../kwin/kwinbindings.cpp:22
+#: ../../twin/twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "Circular por las ventanas (hacia atrás)"
 
-#: ../../kwin/kwinbindings.cpp:23
+#: ../../twin/twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "Circular por los escritorios"
 
-#: ../../kwin/kwinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Circular por los escritorios (hacia atrás)"
 
-#: ../../kwin/kwinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "Circular por la lista de escritorios"
 
-#: ../../kwin/kwinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Circular por la lista escritorios (hacia atrás)"
 
-#: ../../kwin/kwinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:28
 msgid "Windows"
 msgstr "Ventanas"
 
-#: ../../kwin/kwinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "Menú de operaciones de ventana"
 
-#: ../../kwin/kwinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:30
 msgid "Close Window"
 msgstr "Cerrar ventana"
 
-#: ../../kwin/kwinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "Maximizar ventana"
 
-#: ../../kwin/kwinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "Maximizar ventana verticalmente"
 
-#: ../../kwin/kwinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "Maximizar ventana horizontalmente"
 
-#: ../../kwin/kwinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "Minimizar ventana"
 
-#: ../../kwin/kwinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "Sombrear ventana"
 
-#: ../../kwin/kwinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:42
 msgid "Move Window"
 msgstr "Mover ventana"
 
-#: ../../kwin/kwinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "Redimensionar ventana"
 
-#: ../../kwin/kwinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "Restaurar ventana"
 
-#: ../../kwin/kwinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "Bajar ventanas"
 
-#: ../../kwin/kwinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "Alternar ventana al frente/atrás"
 
-#: ../../kwin/kwinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "Ventana en pantalla completa"
 
-#: ../../kwin/kwinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "Ocultar borde la ventana"
 
-#: ../../kwin/kwinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "Mantener ventana sobre otras"
 
-#: ../../kwin/kwinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "Mantener ventana bajo otras"
 
-#: ../../kwin/kwinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "Activar la ventana de requiera atención"
 
-#: ../../kwin/kwinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "Configuración del acceso rápido a la ventana"
 
-#: ../../kwin/kwinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "Empaquetar ventana a la derecha"
 
-#: ../../kwin/kwinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "Empaquetar ventana a la izquierda"
 
-#: ../../kwin/kwinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "Empaquetar ventana arriba"
 
-#: ../../kwin/kwinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "Empaquetar ventana abajo"
 
-#: ../../kwin/kwinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "Extender ventana horizontalmente"
 
-#: ../../kwin/kwinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "Extender ventana verticalmente"
 
-#: ../../kwin/kwinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "Encoger ventana horizontalmente"
 
-#: ../../kwin/kwinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "Encoger ventana verticalmente"
 
-#: ../../kwin/kwinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "Ventana y escritorio"
 
-#: ../../kwin/kwinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "Ventana en todos los escritorios"
 
-#: ../../kwin/kwinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "Ventana al escritorio 1"
 
-#: ../../kwin/kwinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "Ventana al escritorio 2"
 
-#: ../../kwin/kwinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "Ventana al escritorio 3"
 
-#: ../../kwin/kwinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "Ventana al escritorio 4"
 
-#: ../../kwin/kwinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "Ventana al escritorio 5"
 
-#: ../../kwin/kwinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "Ventana al escritorio 6"
 
-#: ../../kwin/kwinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "Ventana al escritorio 7"
 
-#: ../../kwin/kwinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "Ventana al escritorio 8"
 
-#: ../../kwin/kwinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "Ventana al escritorio 9"
 
-#: ../../kwin/kwinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "Ventana al escritorio 10"
 
-#: ../../kwin/kwinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "Ventana al escritorio 11"
 
-#: ../../kwin/kwinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "Ventana al escritorio 12"
 
-#: ../../kwin/kwinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "Ventana al escritorio 13"
 
-#: ../../kwin/kwinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "Ventana al escritorio 14"
 
-#: ../../kwin/kwinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "Ventana al escritorio 15"
 
-#: ../../kwin/kwinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "Ventana al escritorio 16"
 
-#: ../../kwin/kwinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "Ventana al escritorio 17"
 
-#: ../../kwin/kwinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "Ventana al escritorio 18"
 
-#: ../../kwin/kwinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "Ventana al escritorio 19"
 
-#: ../../kwin/kwinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "Ventana al escritorio 20"
 
-#: ../../kwin/kwinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "Ventana al siguiente escritorio"
 
-#: ../../kwin/kwinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "Ventana al escritorio previo"
 
-#: ../../kwin/kwinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "La ventana un escritorio a la derecha"
 
-#: ../../kwin/kwinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "La ventana un escritorio a la izquierda"
 
-#: ../../kwin/kwinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "La ventana un escritorio arriba"
 
-#: ../../kwin/kwinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "La ventana un escritorio abajo"
 
-#: ../../kwin/kwinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "Cambio de escritorio"
 
-#: ../../kwin/kwinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "Cambiar al escritorio 1"
 
-#: ../../kwin/kwinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "Cambiar al escritorio 2"
 
-#: ../../kwin/kwinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "Cambiar al escritorio 3"
 
-#: ../../kwin/kwinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "Cambiar al escritorio 4"
 
-#: ../../kwin/kwinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "Cambiar al escritorio 5"
 
-#: ../../kwin/kwinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "Cambiar al escritorio 6"
 
-#: ../../kwin/kwinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "Cambiar al escritorio 7"
 
-#: ../../kwin/kwinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "Cambiar al escritorio 8"
 
-#: ../../kwin/kwinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "Cambiar al escritorio 9"
 
-#: ../../kwin/kwinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "Cambiar al escritorio 10"
 
-#: ../../kwin/kwinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "Cambiar al escritorio 11"
 
-#: ../../kwin/kwinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "Cambiar al escritorio 12"
 
-#: ../../kwin/kwinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "Cambiar al escritorio 13"
 
-#: ../../kwin/kwinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "Cambiar al escritorio 14"
 
-#: ../../kwin/kwinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "Cambiar al escritorio 15"
 
-#: ../../kwin/kwinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "Cambiar al escritorio 16"
 
-#: ../../kwin/kwinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "Cambiar al escritorio 17"
 
-#: ../../kwin/kwinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "Cambiar al escritorio 18"
 
-#: ../../kwin/kwinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "Cambiar al escritorio 19"
 
-#: ../../kwin/kwinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "Cambiar al escritorio 20"
 
-#: ../../kwin/kwinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "Cambiar al siguiente escritorio"
 
-#: ../../kwin/kwinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "Cambiar al escritorio previo"
 
-#: ../../kwin/kwinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "Cambiar al escritorio de la derecha"
 
-#: ../../kwin/kwinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "Cambiar al escritorio de la izquierda"
 
-#: ../../kwin/kwinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "Cambiar al escritorio superior"
 
-#: ../../kwin/kwinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "Cambiar al escritorio inferior"
 
-#: ../../kwin/kwinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "Emulación de ratón"
 
-#: ../../kwin/kwinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "Matar ventana"
 
-#: ../../kwin/kwinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "Instantánea de ventana"
 
-#: ../../kwin/kwinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "Instantánea de escritorio"
 
-#: ../../kwin/kwinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "Accesos rápidos globales"
 
diff --git a/tde-i18n-es/messages/kdebase/kcmkurifilt.po b/tde-i18n-es/messages/kdebase/kcmkurifilt.po
index 00e5ae15146..01e070c9fa2 100644
--- a/tde-i18n-es/messages/kdebase/kcmkurifilt.po
+++ b/tde-i18n-es/messages/kdebase/kcmkurifilt.po
@@ -358,7 +358,7 @@ msgstr "URLs cor&tas"
 #~ "international versions of each site (e.g. google.com),\n"
 #~ "not to the local site (e.g. google.de).  To change this,\n"
 #~ "add extra 'Query[foo]=...' lines to the .desktop files\n"
-#~ "in kdebase/kcontrol/ebrowsing/plugins/ikws/searchproviders.\n"
+#~ "in tdebase/kcontrol/ebrowsing/plugins/ikws/searchproviders.\n"
 #~ "For example, in google.desktop, copy the original\n"
 #~ "Query=...\n"
 #~ "line to\n"
diff --git a/tde-i18n-es/messages/kdebase/kcmkwindecoration.po b/tde-i18n-es/messages/kdebase/kcmkwindecoration.po
index 3c905d90375..a028ed6cb07 100644
--- a/tde-i18n-es/messages/kdebase/kcmkwindecoration.po
+++ b/tde-i18n-es/messages/kdebase/kcmkwindecoration.po
@@ -1,6 +1,6 @@
-# translation of kcmkwindecoration.po to Spanish
-# translation of kcmkwindecoration.po to español
-# translation of kcmkwindecoration.po to Español
+# translation of kcmtwindecoration.po to Spanish
+# translation of kcmtwindecoration.po to español
+# translation of kcmtwindecoration.po to Español
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Jaime Robles <jaime@kde.org>, 2003.
 # Miguel Revilla Rodríguez <yo@miguelrevilla.com>, 2003.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkwindecoration\n"
+"Project-Id-Version: kcmtwindecoration\n"
 "POT-Creation-Date: 2005-10-28 02:43+0200\n"
 "PO-Revision-Date: 2005-02-20 17:22+0100\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
@@ -91,7 +91,7 @@ msgstr "Menú"
 msgid "--- spacer ---"
 msgstr "--- espaciador ---"
 
-#: 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."
@@ -99,24 +99,24 @@ msgstr ""
 "Seleccionar el estilo de la ventana. Este se refiere al aspecto y "
 "comportamiento de los bordes de la ventana y del asa de la ventana."
 
-#: kwindecoration.cpp:95
+#: twindecoration.cpp:95
 msgid "Decoration Options"
 msgstr "Opciones de decoración"
 
-#: kwindecoration.cpp:105
+#: twindecoration.cpp:105
 msgid "B&order size:"
 msgstr "Tamaño del b&orde:"
 
-#: kwindecoration.cpp:108
+#: twindecoration.cpp:108
 msgid "Use this combobox to change the border size of the decoration."
 msgstr ""
 "Use esta lista desplegable para cambiar el tamaño del borde de la decoración."
 
-#: kwindecoration.cpp:124
+#: twindecoration.cpp:124
 msgid "&Show window button tooltips"
 msgstr "&Mostrar sugerencias de botones de ventanas"
 
-#: 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."
@@ -125,11 +125,11 @@ msgstr ""
 "la ventana. Si la casilla está sin seleccionar, no se mostrará ningún consejo "
 "de herramientas."
 
-#: kwindecoration.cpp:130
+#: twindecoration.cpp:130
 msgid "Use custom titlebar button &positions"
 msgstr "Utilizar &posiciones personalizadas de botón de la barra de título"
 
-#: 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."
@@ -137,59 +137,59 @@ msgstr ""
 "Las preferencias apropiadas pueden encontrarse en la pestaña \"Botones\". "
 "Advierta que esta opción todavía no está disponible para todos los estilos."
 
-#: kwindecoration.cpp:163
+#: twindecoration.cpp:163
 msgid "&Window Decoration"
 msgstr "Decoración de la &ventana"
 
-#: kwindecoration.cpp:164
+#: twindecoration.cpp:164
 msgid "&Buttons"
 msgstr "&Botones"
 
-#: 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 "Módulo de control de decoración de ventana"
 
-#: kwindecoration.cpp:185
+#: twindecoration.cpp:185
 msgid "(c) 2001 Karol Szwed"
 msgstr "(c) 2001 Karol Szwed"
 
-#: kwindecoration.cpp:237 kwindecoration.cpp:439
+#: twindecoration.cpp:237 twindecoration.cpp:439
 msgid "KDE 2"
 msgstr "KDE 2"
 
-#: kwindecoration.cpp:266
+#: twindecoration.cpp:266
 msgid "Tiny"
 msgstr "Pequeño"
 
-#: kwindecoration.cpp:267
+#: twindecoration.cpp:267
 msgid "Normal"
 msgstr "Normal"
 
-#: kwindecoration.cpp:268
+#: twindecoration.cpp:268
 msgid "Large"
 msgstr "Grande"
 
-#: kwindecoration.cpp:269
+#: twindecoration.cpp:269
 msgid "Very Large"
 msgstr "Muy grande"
 
-#: kwindecoration.cpp:270
+#: twindecoration.cpp:270
 msgid "Huge"
 msgstr "Enorme"
 
-#: kwindecoration.cpp:271
+#: twindecoration.cpp:271
 msgid "Very Huge"
 msgstr "Gigantesco"
 
-#: kwindecoration.cpp:272
+#: twindecoration.cpp:272
 msgid "Oversized"
 msgstr "Pasado de tamaño"
 
-#: kwindecoration.cpp:591
+#: twindecoration.cpp:591
 msgid ""
 "<h1>Window Manager Decoration</h1>"
 "<p>This module allows you to choose the window border decorations, as well as "
diff --git a/tde-i18n-es/messages/kdebase/kcmkwinrules.po b/tde-i18n-es/messages/kdebase/kcmkwinrules.po
index 6e15cbdf687..925214f2a4c 100644
--- a/tde-i18n-es/messages/kdebase/kcmkwinrules.po
+++ b/tde-i18n-es/messages/kdebase/kcmkwinrules.po
@@ -1,15 +1,15 @@
-# Translation of kcmkwinrules to Spanish
+# Translation of kcmtwinrules to Spanish
 # Miguel Revilla Rodríguez <yo@miguelrevilla.com>, 2004.
 # Pablo de Vicente <p.devicente@wanadoo.es>, 2004.
 # Juan Manuel Garcia Molina <juanma@superiodico.net>, 2005.
 # Jaime Robles <jaime@robles.nu>, 2005.
 # Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2007.
-# translation of kcmkwinrules.po to Spanish
-# translation of kcmkwinrules.po to español
-# translation of kcmkwinrules.po to Español
+# translation of kcmtwinrules.po to Spanish
+# translation of kcmtwinrules.po to español
+# translation of kcmtwinrules.po to Español
 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: 2007-10-23 08:38+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
@@ -96,8 +96,8 @@ msgid "Unknown - will be treated as Normal Window"
 msgstr "Desconocido - se considerará como Ventana normal"
 
 #: 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-es/messages/kdebase/kcmkwm.po b/tde-i18n-es/messages/kdebase/kcmkwm.po
index 1636e1e079d..eb72506d253 100644
--- a/tde-i18n-es/messages/kdebase/kcmkwm.po
+++ b/tde-i18n-es/messages/kdebase/kcmkwm.po
@@ -61,8 +61,8 @@ msgid "&Translucency"
 msgstr "&Translucidez"
 
 #: main.cpp:126
-msgid "kcmkwinoptions"
-msgstr "kcmkwinoptions"
+msgid "kcmtwinoptions"
+msgstr "kcmtwinoptions"
 
 #: main.cpp:126
 msgid "Window Behavior Configuration Module"
@@ -1035,7 +1035,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>"
@@ -1053,7 +1053,7 @@ msgstr ""
 "<br>"
 "<br>Haga el favor de comprobar que tiene <a "
 "href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>"
-", y de que está instaldo el kompmgr que venía con kwin."
+", y de que está instaldo el kompmgr que venía con twin."
 "<br>Compruebe también que tiene las entradas siguientes en su XConfig "
 "(posiblemente, /etc/X11/xorg.conf):"
 "<br>"
diff --git a/tde-i18n-es/messages/kdebase/kcmsmartcard.po b/tde-i18n-es/messages/kdebase/kcmsmartcard.po
index 377c223b108..e8b78c55a03 100644
--- a/tde-i18n-es/messages/kdebase/kcmsmartcard.po
+++ b/tde-i18n-es/messages/kdebase/kcmsmartcard.po
@@ -47,19 +47,19 @@ msgstr "Posibles motivos"
 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) El demonio de KDE, 'kded' no se está ejecutando. Puede reiniciarlo "
-"ejecutando la orden 'kdeinit' y después intentar recargar el centro de control "
+"ejecutando la orden 'tdeinit' y después intentar recargar el centro de control "
 "de KDE para ver si este mensaje desaparece.\n"
 "\n"
 "2) No parece que tenga soporte para smartcard en las bibliotecas de KDE. "
-"Necesitará recompilar el paquete kdelibs con libpcsclite instalado."
+"Necesitará recompilar el paquete tdelibs con libpcsclite instalado."
 
 #. i18n: file smartcardbase.ui line 31
 #: rc.cpp:15
diff --git a/tde-i18n-es/messages/kdebase/kdeprint_part.po b/tde-i18n-es/messages/kdebase/kdeprint_part.po
index c4f51a3a2a1..7ce7950a76c 100644
--- a/tde-i18n-es/messages/kdebase/kdeprint_part.po
+++ b/tde-i18n-es/messages/kdebase/kdeprint_part.po
@@ -28,14 +28,14 @@ msgid ""
 msgstr "vicente@oan.es"
 
 #: 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 "Un plugin de Konqueror para la administración de impresión"
 
-#. 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-es/messages/kdebase/kdeprintfax.po b/tde-i18n-es/messages/kdebase/kdeprintfax.po
index e18b74e560a..9d71d09198a 100644
--- a/tde-i18n-es/messages/kdebase/kdeprintfax.po
+++ b/tde-i18n-es/messages/kdebase/kdeprintfax.po
@@ -1,4 +1,4 @@
-# translation of kdeprintfax.po to Spanish
+# translation of tdeprintfax.po to Spanish
 # Translation to spanish.
 # Copyright (C) 2000-2002.
 #
@@ -8,7 +8,7 @@
 # Pablo de Vicente <pablo.devicente@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprintfax\n"
+"Project-Id-Version: tdeprintfax\n"
 "POT-Creation-Date: 2006-04-28 03:54+0200\n"
 "PO-Revision-Date: 2006-04-29 15:20+0200\n"
 "Last-Translator: Pablo de Vicente <pablo.devicente@gmail.com>\n"
@@ -146,8 +146,8 @@ msgid ""
 msgstr "pvicentea@wanadoo.es"
 
 #: main.cpp:33
-msgid "A small fax utility to be used with kdeprint."
-msgstr "Una pequeña utilidad de fax para ser usada con kdeprint."
+msgid "A small fax utility to be used with tdeprint."
+msgstr "Una pequeña utilidad de fax para ser usada con tdeprint."
 
 #: main.cpp:39
 msgid "Phone number to fax to"
@@ -181,7 +181,7 @@ msgstr "Tipo MIME:"
 msgid "Command:"
 msgstr "Orden:"
 
-#. i18n: file kdeprintfaxui.rc line 10
+#. i18n: file tdeprintfaxui.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Fa&x"
@@ -251,11 +251,11 @@ msgstr "Filtros"
 msgid "Filters Configuration"
 msgstr "Configuración de filtros"
 
-#: faxab.cpp:41 kdeprintfax.cpp:88
+#: faxab.cpp:41 tdeprintfax.cpp:88
 msgid "Name"
 msgstr "Nombre"
 
-#: faxab.cpp:42 kdeprintfax.cpp:87 kdeprintfax.cpp:562
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
 msgid "Fax Number"
 msgstr "Número de fax"
 
@@ -271,143 +271,143 @@ msgstr "&Editar libreta de direcciones"
 msgid "No fax number found in your address book."
 msgstr "No se encontró número de fax en su libreta de direcciones."
 
-#: kdeprintfax.cpp:74
+#: tdeprintfax.cpp:74
 msgid "Move up"
 msgstr "Subir"
 
-#: kdeprintfax.cpp:79
+#: tdeprintfax.cpp:79
 msgid "Move down"
 msgstr "Bajar"
 
-#: kdeprintfax.cpp:82
+#: tdeprintfax.cpp:82
 msgid "F&iles:"
 msgstr "Arch&ivos:"
 
-#: kdeprintfax.cpp:89
+#: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "Empresa"
 
-#: kdeprintfax.cpp:96
+#: tdeprintfax.cpp:96
 msgid "Add fax number"
 msgstr "Añadir número de fax"
 
-#: kdeprintfax.cpp:100
+#: tdeprintfax.cpp:100
 msgid "Add fax number from addressbook"
 msgstr "Añadir número de fax de la libreta de direcciones"
 
-#: kdeprintfax.cpp:104
+#: tdeprintfax.cpp:104
 msgid "Remove fax number"
 msgstr "Eliminar número de fax"
 
-#: kdeprintfax.cpp:107
+#: tdeprintfax.cpp:107
 msgid "&Comment:"
 msgstr "&Comentario:"
 
-#: kdeprintfax.cpp:118
+#: tdeprintfax.cpp:118
 msgid "Sched&ule:"
 msgstr "Pla&n:"
 
-#: kdeprintfax.cpp:120
+#: tdeprintfax.cpp:120
 msgid "Now"
 msgstr "Ahora"
 
-#: kdeprintfax.cpp:121
+#: tdeprintfax.cpp:121
 msgid "At Specified Time"
 msgstr "En el tiempo especificado"
 
-#: kdeprintfax.cpp:128
+#: tdeprintfax.cpp:128
 msgid "Send Co&ver Sheet"
 msgstr "En&viar portada"
 
-#: kdeprintfax.cpp:131
+#: tdeprintfax.cpp:131
 msgid "Su&bject:"
 msgstr "As&unto:"
 
-#: kdeprintfax.cpp:172 kdeprintfax.cpp:252
+#: tdeprintfax.cpp:172 tdeprintfax.cpp:252
 msgid "Processing..."
 msgstr "Procesando..."
 
-#: kdeprintfax.cpp:173 kdeprintfax.cpp:402
+#: tdeprintfax.cpp:173 tdeprintfax.cpp:402
 msgid "Idle"
 msgstr "Inactivo"
 
-#: kdeprintfax.cpp:177
+#: tdeprintfax.cpp:177
 msgid "Send to Fax"
 msgstr "Enviar al fax"
 
-#: kdeprintfax.cpp:191
+#: tdeprintfax.cpp:191
 msgid "&Add File..."
 msgstr "&Añadir archivo..."
 
-#: kdeprintfax.cpp:192
+#: tdeprintfax.cpp:192
 msgid "&Remove File"
 msgstr "E&liminar archivo"
 
-#: kdeprintfax.cpp:193
+#: tdeprintfax.cpp:193
 msgid "&Send Fax"
 msgstr "En&viar fax"
 
-#: kdeprintfax.cpp:194
+#: tdeprintfax.cpp:194
 msgid "A&bort"
 msgstr "A&bortar"
 
-#: kdeprintfax.cpp:195
+#: tdeprintfax.cpp:195
 msgid "A&ddress Book"
 msgstr "Li&breta de direcciones"
 
-#: kdeprintfax.cpp:196
+#: tdeprintfax.cpp:196
 msgid "V&iew Log"
 msgstr "Ver &registro"
 
-#: kdeprintfax.cpp:197
+#: tdeprintfax.cpp:197
 msgid "Vi&ew File"
 msgstr "Ver arc&hivo"
 
-#: kdeprintfax.cpp:198
+#: tdeprintfax.cpp:198
 msgid "&New Fax Recipient..."
 msgstr "&Nuevo destinatario de fax..."
 
-#: kdeprintfax.cpp:245
+#: tdeprintfax.cpp:245
 msgid "No file to fax."
 msgstr "Ningún archivo para enviar por fax."
 
-#: kdeprintfax.cpp:247
+#: tdeprintfax.cpp:247
 msgid "No fax number specified."
 msgstr "Ningún número de fax especificado."
 
-#: kdeprintfax.cpp:255
+#: tdeprintfax.cpp:255
 msgid "Unable to start Fax process."
 msgstr "Imposible iniciar proceso de fax."
 
-#: kdeprintfax.cpp:261
+#: tdeprintfax.cpp:261
 msgid "Unable to stop Fax process."
 msgstr "Imposible detener proceso de fax."
 
-#: kdeprintfax.cpp:284
+#: tdeprintfax.cpp:284
 #, c-format
 msgid "Unable to retrieve %1."
 msgstr "Imposible recuperar %1."
 
-#: kdeprintfax.cpp:409
+#: tdeprintfax.cpp:409
 msgid "Fax error: see log message for more information."
 msgstr "Error de fax: ver mensaje de registro para más información."
 
-#: kdeprintfax.cpp:564
+#: tdeprintfax.cpp:564
 msgid "Enter recipient fax properties."
 msgstr "Introducir propiedades del destinatario."
 
-#: kdeprintfax.cpp:565
+#: tdeprintfax.cpp:565
 msgid "&Number:"
 msgstr "&Número:"
 
-#: kdeprintfax.cpp:566
+#: tdeprintfax.cpp:566
 msgid "N&ame:"
 msgstr "N&ombre:"
 
-#: kdeprintfax.cpp:567
+#: tdeprintfax.cpp:567
 msgid "&Enterprise:"
 msgstr "&Empresa:"
 
-#: kdeprintfax.cpp:593
+#: tdeprintfax.cpp:593
 msgid "Invalid fax number."
 msgstr "Número de fax no válido."
diff --git a/tde-i18n-es/messages/kdebase/kdesu.po b/tde-i18n-es/messages/kdebase/kdesu.po
index c6d6b08774e..c61b45bd279 100644
--- a/tde-i18n-es/messages/kdebase/kdesu.po
+++ b/tde-i18n-es/messages/kdebase/kdesu.po
@@ -1,4 +1,4 @@
-# translation of kdesu.po to Spanish
+# translation of tdesu.po to Spanish
 # Translation to spanish.
 # Copyright (C) 2000-2002.
 #
@@ -9,7 +9,7 @@
 # Pablo de Vicente <pablo.devicente@gmail.com>, 2006.
 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: 2006-09-09 09:16+0200\n"
 "Last-Translator: Pablo de Vicente <pablo.devicente@gmail.com>\n"
@@ -20,99 +20,99 @@ msgstr ""
 "First-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: kdesu.cpp:56 kdesu.cpp:57
+#: tdesu.cpp:56 tdesu.cpp:57
 msgid "Specifies the command to run"
 msgstr "Especifica la orden a ejecutar"
 
-#: kdesu.cpp:58
+#: tdesu.cpp:58
 msgid "Run command under target uid if <file> is not writable"
 msgstr ""
 "Ejecutar la orden bajo UID de destino si no se puede escribir al archivo <file>"
 
-#: kdesu.cpp:59
+#: tdesu.cpp:59
 msgid "Specifies the target uid"
 msgstr "Especifica el UID de destino"
 
-#: kdesu.cpp:60
+#: tdesu.cpp:60
 msgid "Do not keep password"
 msgstr "No guardar la contraseña"
 
-#: kdesu.cpp:61
+#: tdesu.cpp:61
 msgid "Stop the daemon (forgets all passwords)"
 msgstr "Detener el demonio (olvida todas las contraseñas)"
 
-#: kdesu.cpp:62
+#: tdesu.cpp:62
 msgid "Enable terminal output (no password keeping)"
 msgstr "Activar la salida del terminal (no guarda las contraseñas)"
 
-#: kdesu.cpp:63
+#: tdesu.cpp:63
 msgid "Set priority value: 0 <= prio <= 100, 0 is lowest"
 msgstr "Valor de la prioridad: 0 <= prio <= 100, 0 es la más baja"
 
-#: kdesu.cpp:64
+#: tdesu.cpp:64
 msgid "Use realtime scheduling"
 msgstr "Usar planificación en tiempo real"
 
-#: kdesu.cpp:65
+#: tdesu.cpp:65
 msgid "Let command use existing dcopserver"
 msgstr "Permitir que la orden utilice el dcopserver existente"
 
-#: kdesu.cpp:66
+#: tdesu.cpp:66
 msgid "Do not display ignore button"
 msgstr "No mostrar el botón ignorar"
 
-#: kdesu.cpp:67
+#: tdesu.cpp:67
 msgid "Specify icon to use in the password dialog"
 msgstr "Especificar el icono que se utilizará en el diálogo de contraseña"
 
-#: kdesu.cpp:68
+#: tdesu.cpp:68
 msgid "Do not show the command to be run in the dialog"
 msgstr "No mostrar la orden que se ejecutará en el diálogo"
 
-#: kdesu.cpp:99
+#: tdesu.cpp:99
 msgid "KDE su"
 msgstr "KDE Su"
 
-#: kdesu.cpp:100
+#: tdesu.cpp:100
 msgid "Runs a program with elevated privileges."
 msgstr "Ejecuta un programa con privilegios elevados."
 
-#: kdesu.cpp:103
+#: tdesu.cpp:103
 msgid "Maintainer"
 msgstr "Encargado"
 
-#: kdesu.cpp:105
+#: tdesu.cpp:105
 msgid "Original author"
 msgstr "Autor original"
 
-#: kdesu.cpp:131
+#: tdesu.cpp:131
 msgid "Command '%1' not found."
 msgstr "No se encontró la orden '%1'."
 
-#: kdesu.cpp:207
+#: tdesu.cpp:207
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "Prioridad ilegal: %1"
 
-#: kdesu.cpp:235
+#: tdesu.cpp:235
 msgid "No command specified."
 msgstr "No se especificó ninguna orden."
 
-#: kdesu.cpp:344
+#: tdesu.cpp:344
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "Su devolvió un error.\n"
 
-#: kdesu.cpp:365
+#: tdesu.cpp:365
 msgid "Command:"
 msgstr "Orden:"
 
-#: kdesu.cpp:370
+#: tdesu.cpp:370
 msgid "realtime: "
 msgstr "tiempo real: "
 
-#: kdesu.cpp:373
+#: tdesu.cpp:373
 msgid "Priority:"
 msgstr "Prioridad:"
 
diff --git a/tde-i18n-es/messages/kdebase/kdesud.po b/tde-i18n-es/messages/kdebase/kdesud.po
index 5d5fa411420..a576f0e64dd 100644
--- a/tde-i18n-es/messages/kdebase/kdesud.po
+++ b/tde-i18n-es/messages/kdebase/kdesud.po
@@ -4,7 +4,7 @@
 #
 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: 2002-08-06 15:31CET\n"
 "Last-Translator: Pablo de Vicente <vicente@oan.es>\n"
@@ -15,15 +15,15 @@ msgstr ""
 "First-Translator: Valux (José Luis Sánchez) <jsanchezv@teleline.es>\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kdesud.cpp:251
+#: tdesud.cpp:251
 msgid "KDE su daemon"
 msgstr "Demonio Su de KDE"
 
-#: kdesud.cpp:252
-msgid "Daemon used by kdesu"
+#: tdesud.cpp:252
+msgid "Daemon used by tdesu"
 msgstr "Demonio utilizado por Kdesu."
 
-#: kdesud.cpp:255
+#: tdesud.cpp:255
 msgid "Author"
 msgstr "Autor"
 
diff --git a/tde-i18n-es/messages/kdebase/ksmserver.po b/tde-i18n-es/messages/kdebase/ksmserver.po
index 94d6846ea8d..23a6a0ac170 100644
--- a/tde-i18n-es/messages/kdebase/ksmserver.po
+++ b/tde-i18n-es/messages/kdebase/ksmserver.po
@@ -50,10 +50,10 @@ msgstr "Restaura la sesión anterior si está disponible"
 #: 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 ""
 "Inicia 'wm' en el caso de que no haya otro administrador de\n"
-"ventanas participando en la sesión. El predeterminado es 'kwin'"
+"ventanas participando en la sesión. El predeterminado es 'twin'"
 
 #: main.cpp:38
 msgid "Also allow remote connections"
diff --git a/tde-i18n-es/messages/kdebase/ktip.po b/tde-i18n-es/messages/kdebase/ktip.po
index 2280b729f58..3705550501d 100644
--- a/tde-i18n-es/messages/kdebase/ktip.po
+++ b/tde-i18n-es/messages/kdebase/ktip.po
@@ -59,7 +59,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"
@@ -75,7 +75,7 @@ msgstr ""
 "sitios útiles para aplicaciones grandes como\n"
 "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
 "<A HREF=\"http://www.koffice.org/\">KOffice</A> y\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A> o utilidades\n"
+"<A HREF=\"http://www.tdevelop.org/\">KDevelop</A> o utilidades\n"
 "importantes como\n"
 "<A HREF=\"http://printing.kde.org/\">KDEPrint</A>,\n"
 "que se puede hacer funcionar plenamente incluso fuera de KDE...\n"
@@ -630,7 +630,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"
@@ -640,7 +640,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"
@@ -650,7 +650,7 @@ msgstr ""
 "<p>\n"
 "¿Necesita ayuda para imprimir en KDE?"
 "<br> </p>\n"
-"<p> Introduzca <strong>help:/kdeprint/</strong> en el \n"
+"<p> Introduzca <strong>help:/tdeprint/</strong> en el \n"
 "campo de entrada de dirección de Konqueror y se le mostrará el  <a "
 "href=\"http://printing.kde.org/documentation/handbook/\">manual de KDEPrint </a>"
 "\n"
@@ -660,7 +660,7 @@ msgstr ""
 " <a href=\"http://printing.kde.org/documentation/tutorials/\">Tutoriales</a>, \n"
 "una sección \"Trucos y Sugerencias\" y la \n"
 " <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"lista de correo de kdeprint</a>) \n"
+"lista de correo de tdeprint</a>) \n"
 " están disponibles en el servidor web\n"
 "<a href=\"http://printing.kde.org/\">printing.kde.org</a>... \n"
 "</p>\n"
@@ -923,7 +923,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"
@@ -938,7 +938,7 @@ msgstr ""
 "Funciona con Netscape, Mozilla, Galeon, gv, Acrobat Reader, StarOffice, "
 "OpenOffice.org,\n"
 "cualquier aplicación GNOME y muchas otras...</p>\n"
-"<p>Consulte <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>Consulte <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a>\n"
 "para más información detallada... \n"
 "</p>\n"
@@ -1080,7 +1080,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"
@@ -1096,7 +1096,7 @@ msgstr ""
 "la línea de órdenes:\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"
 " Imprime 3 archivos diferentes (de diferentes carpetas) en la impresora "
 "\"infotec\".\n"
diff --git a/tde-i18n-es/messages/kdebase/kwin.po b/tde-i18n-es/messages/kdebase/kwin.po
index 0c1f19f436f..6ac21b2d567 100644
--- a/tde-i18n-es/messages/kdebase/kwin.po
+++ b/tde-i18n-es/messages/kdebase/kwin.po
@@ -1,5 +1,5 @@
-# traducción de kwin.po a Español
-# translation of kwin.po to Spanish
+# traducción de twin.po a Español
+# translation of twin.po to Spanish
 # Translation to spanish
 # Copyright (C) 1999-2002.
 #
@@ -12,7 +12,7 @@
 # Eloy Cuadra <ecuadra@eloihr.net>, 2008.
 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: 2008-06-05 13:52+0200\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
@@ -39,404 +39,404 @@ msgstr "jaime@kde.org,vicente@oan.es,yo@miguelrevilla.com"
 msgid "Window '%1' demands attention."
 msgstr "La ventana '%1' pide atención."
 
-#: kwinbindings.cpp:18
+#: twinbindings.cpp:18
 msgid "System"
 msgstr "Sistema"
 
-#: kwinbindings.cpp:20
+#: twinbindings.cpp:20
 msgid "Navigation"
 msgstr "Navegación"
 
-#: kwinbindings.cpp:21
+#: twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "Circular por las ventanas"
 
-#: kwinbindings.cpp:22
+#: twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "Circular por las ventanas (hacia atrás)"
 
-#: kwinbindings.cpp:23
+#: twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "Circular por los escritorios"
 
-#: kwinbindings.cpp:24
+#: twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Circular por los escritorios (hacia atrás)"
 
-#: kwinbindings.cpp:25
+#: twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "Circular por la lista de escritorios"
 
-#: kwinbindings.cpp:26
+#: twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Circular por la lista escritorios (hacia atrás)"
 
-#: kwinbindings.cpp:28
+#: twinbindings.cpp:28
 msgid "Windows"
 msgstr "Ventanas"
 
-#: kwinbindings.cpp:29
+#: twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "Menú de operaciones de ventana"
 
-#: kwinbindings.cpp:30
+#: twinbindings.cpp:30
 msgid "Close Window"
 msgstr "Cerrar ventana"
 
-#: kwinbindings.cpp:32
+#: twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "Maximizar ventana"
 
-#: kwinbindings.cpp:34
+#: twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "Maximizar ventana verticalmente"
 
-#: kwinbindings.cpp:36
+#: twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "Maximizar ventana horizontalmente"
 
-#: kwinbindings.cpp:38
+#: twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "Minimizar ventana"
 
-#: kwinbindings.cpp:40
+#: twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "Sombrear ventana"
 
-#: kwinbindings.cpp:42
+#: twinbindings.cpp:42
 msgid "Move Window"
 msgstr "Mover ventana"
 
-#: kwinbindings.cpp:44
+#: twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "Redimensionar ventana"
 
-#: kwinbindings.cpp:46
+#: twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "Restaurar ventana"
 
-#: kwinbindings.cpp:48
+#: twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "Enviar ventana atrás"
 
-#: kwinbindings.cpp:50
+#: twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "Alternar pasar ventana al frente/atrás"
 
-#: kwinbindings.cpp:51
+#: twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "Ventana en pantalla completa"
 
-#: kwinbindings.cpp:53
+#: twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "Ocultar borde de la ventana"
 
-#: kwinbindings.cpp:55
+#: twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "Mantener ventana sobre el resto"
 
-#: kwinbindings.cpp:57
+#: twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "Mantener ventana detrás del resto"
 
-#: kwinbindings.cpp:59
+#: twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "Activar la ventana que pida atención"
 
-#: kwinbindings.cpp:60
+#: twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "Configuración de accesos de teclado de la ventana"
 
-#: kwinbindings.cpp:61
+#: twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "Empaquetar ventana a la derecha"
 
-#: kwinbindings.cpp:63
+#: twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "Empaquetar ventana a la izquierda"
 
-#: kwinbindings.cpp:65
+#: twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "Empaquetar ventana arriba"
 
-#: kwinbindings.cpp:67
+#: twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "Empaquetar ventana abajo"
 
-#: kwinbindings.cpp:69
+#: twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "Extender ventana horizontalmente"
 
-#: kwinbindings.cpp:71
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "Extender ventana verticalmente"
 
-#: kwinbindings.cpp:73
+#: twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "Encoger ventana horizontalmente"
 
-#: kwinbindings.cpp:75
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "Encoger ventana verticalmente"
 
-#: kwinbindings.cpp:78
+#: twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "Ventana y escritorio"
 
-#: kwinbindings.cpp:79
+#: twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "Mantener ventana en todos los escritorios"
 
-#: kwinbindings.cpp:81
+#: twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "Ventana al escritorio 1"
 
-#: kwinbindings.cpp:82
+#: twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "Ventana al escritorio 2"
 
-#: kwinbindings.cpp:83
+#: twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "Ventana al escritorio 3"
 
-#: kwinbindings.cpp:84
+#: twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "Ventana al escritorio 4"
 
-#: kwinbindings.cpp:85
+#: twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "Ventana al escritorio 5"
 
-#: kwinbindings.cpp:86
+#: twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "Ventana al escritorio 6"
 
-#: kwinbindings.cpp:87
+#: twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "Ventana al escritorio 7"
 
-#: kwinbindings.cpp:88
+#: twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "Ventana al escritorio 8"
 
-#: kwinbindings.cpp:89
+#: twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "Ventana al escritorio 9"
 
-#: kwinbindings.cpp:90
+#: twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "Ventana al escritorio 10"
 
-#: kwinbindings.cpp:91
+#: twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "Ventana al escritorio 11"
 
-#: kwinbindings.cpp:92
+#: twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "Ventana al escritorio 12"
 
-#: kwinbindings.cpp:93
+#: twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "Ventana al escritorio 13"
 
-#: kwinbindings.cpp:94
+#: twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "Ventana al escritorio 14"
 
-#: kwinbindings.cpp:95
+#: twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "Ventana al escritorio 15"
 
-#: kwinbindings.cpp:96
+#: twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "Ventana al escritorio 16"
 
-#: kwinbindings.cpp:97
+#: twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "Ventana al escritorio 17"
 
-#: kwinbindings.cpp:98
+#: twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "Ventana al escritorio 18"
 
-#: kwinbindings.cpp:99
+#: twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "Ventana al escritorio 19"
 
-#: kwinbindings.cpp:100
+#: twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "Ventana al escritorio 20"
 
-#: kwinbindings.cpp:101
+#: twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "Ventana al siguiente escritorio"
 
-#: kwinbindings.cpp:102
+#: twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "Ventana al escritorio previo"
 
-#: kwinbindings.cpp:103
+#: twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "Cambiar al escritorio de la derecha"
 
-#: kwinbindings.cpp:104
+#: twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "Cambiar al escritorio de la izquierda"
 
-#: kwinbindings.cpp:105
+#: twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "Cambiar al escritorio superior"
 
-#: kwinbindings.cpp:106
+#: twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "Cambiar al escritorio inferior"
 
-#: kwinbindings.cpp:108
+#: twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "Cambio de escritorio"
 
-#: kwinbindings.cpp:109
+#: twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "Cambiar al escritorio 1"
 
-#: kwinbindings.cpp:110
+#: twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "Cambiar al escritorio 2"
 
-#: kwinbindings.cpp:111
+#: twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "Cambiar al escritorio 3"
 
-#: kwinbindings.cpp:112
+#: twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "Cambiar al escritorio 4"
 
-#: kwinbindings.cpp:113
+#: twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "Cambiar al escritorio 5"
 
-#: kwinbindings.cpp:114
+#: twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "Cambiar al escritorio 6"
 
-#: kwinbindings.cpp:115
+#: twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "Cambiar al escritorio 7"
 
-#: kwinbindings.cpp:116
+#: twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "Cambiar al escritorio 8"
 
-#: kwinbindings.cpp:117
+#: twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "Cambiar al escritorio 9"
 
-#: kwinbindings.cpp:118
+#: twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "Cambiar al escritorio 10"
 
-#: kwinbindings.cpp:119
+#: twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "Cambiar al escritorio 11"
 
-#: kwinbindings.cpp:120
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "Cambiar al escritorio 12"
 
-#: kwinbindings.cpp:121
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "Cambiar al escritorio 13"
 
-#: kwinbindings.cpp:122
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "Cambiar al escritorio 14"
 
-#: kwinbindings.cpp:123
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "Cambiar al escritorio 15"
 
-#: kwinbindings.cpp:124
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "Cambiar al escritorio 16"
 
-#: kwinbindings.cpp:125
+#: twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "Cambiar al escritorio 17"
 
-#: kwinbindings.cpp:126
+#: twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "Cambiar al escritorio 18"
 
-#: kwinbindings.cpp:127
+#: twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "Cambiar al escritorio 19"
 
-#: kwinbindings.cpp:128
+#: twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "Cambiar al escritorio 20"
 
-#: kwinbindings.cpp:129
+#: twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "Cambiar al siguiente escritorio"
 
-#: kwinbindings.cpp:130
+#: twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "Cambiar al escritorio previo"
 
-#: kwinbindings.cpp:131
+#: twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "Cambiar al escritorio de la derecha"
 
-#: kwinbindings.cpp:132
+#: twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "Cambiar al escritorio de la izquierda"
 
-#: kwinbindings.cpp:133
+#: twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "Cambiar al escritorio superior"
 
-#: kwinbindings.cpp:134
+#: twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "Cambiar al escritorio inferior"
 
-#: kwinbindings.cpp:137
+#: twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "Emulación de ratón"
 
-#: kwinbindings.cpp:138
+#: twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "Matar ventana"
 
-#: kwinbindings.cpp:139
+#: twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "Instantánea de ventana"
 
-#: kwinbindings.cpp:140
+#: twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "Instantánea de escritorio"
 
-#: kwinbindings.cpp:145
+#: twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "Bloquear accesos rápidos globales"
 
 #: 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: parece que ya hay un administrador de ventanas activo. kwin no se "
+"twin: parece que ya hay un administrador de ventanas activo. twin no se "
 "inició.\n"
 
 #: main.cpp:80
-msgid "kwin: failure during initialization; aborting"
-msgstr "kwin: fallo al inicializar; cancelando"
+msgid "twin: failure during initialization; aborting"
+msgstr "twin: fallo al inicializar; cancelando"
 
 #: 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: no pude usar el gestor seleccionado, ¿quizá hay otro gestor de ventanas "
+"twin: no pude usar el gestor seleccionado, ¿quizá hay otro gestor de ventanas "
 "en marcha? (en dicho caso intente usar --replace)\n"
 
 #: main.cpp:182
diff --git a/tde-i18n-es/messages/kdebase/kwin_clients.po b/tde-i18n-es/messages/kdebase/kwin_clients.po
index e7d2f549ea4..40c25f228e6 100644
--- a/tde-i18n-es/messages/kdebase/kwin_clients.po
+++ b/tde-i18n-es/messages/kdebase/kwin_clients.po
@@ -1,12 +1,12 @@
-# traducción de kwin_clients.po a Español
-# translation of kwin_clients.po to Spanish
-# translation of kwin_clients.po to español
+# traducción de twin_clients.po a Español
+# translation of twin_clients.po to Spanish
+# translation of twin_clients.po to español
 # Pablo de Vicente <p.devicente@wanadoo.es>, 2004.
 # Jaime Robles <jaime@kde.org>, 2005.
 # Santiago Fernandez Sancho <santi@kde-es.org>, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_clients\n"
+"Project-Id-Version: twin_clients\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2005-11-16 19:51+0100\n"
 "Last-Translator: Santiago Fernandez Sancho <santi@kde-es.org>\n"
diff --git a/tde-i18n-es/messages/kdebase/kwin_lib.po b/tde-i18n-es/messages/kdebase/kwin_lib.po
index 286d6fed7b5..da983caf831 100644
--- a/tde-i18n-es/messages/kdebase/kwin_lib.po
+++ b/tde-i18n-es/messages/kdebase/kwin_lib.po
@@ -1,9 +1,9 @@
-# translation of kwin_lib.po to Spanish
+# translation of twin_lib.po to Spanish
 # Jaime Robles <jaime@robles.nu>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_lib\n"
+"Project-Id-Version: twin_lib\n"
 "POT-Creation-Date: 2005-10-08 02:42+0200\n"
 "PO-Revision-Date: 2005-10-23 22:02+0200\n"
 "Last-Translator: \n"