Initial kde-tde rename

18 files changed, 392 insertions, 392 deletions

diff --git a/tde-i18n-ja/messages/kdebase/Makefile.in b/tde-i18n-ja/messages/kdebase/Makefile.in
index f31998be3ad..cfe8d3b35b8 100644
--- a/tde-i18n-ja/messages/kdebase/Makefile.in
+++ b/tde-i18n-ja/messages/kdebase/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = messages/kdebase
+subdir = messages/tdebase
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -164,7 +164,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -192,8 +192,8 @@ KDE_LANG = ja
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po
-GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmtwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po tdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po tdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po twin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmtwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_tdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po twin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po twin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po tdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po tdeprint_part.po kio_smtp.po
+GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -208,9 +208,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
+#>- 	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -220,10 +220,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
+KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po twin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po tdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmtwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po twin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in tdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_tdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po twin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmtwinrules.po libdmctl.po krdb.po kio_home.po tdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po tdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
 
 #>+ 469
 kio_sftp.gmo: kio_sftp.po
@@ -573,9 +573,9 @@ kcmlaunch.gmo: kcmlaunch.po
 kcminfo.gmo: kcminfo.po
 	rm -f kcminfo.gmo; $(GMSGFMT) -o kcminfo.gmo $(srcdir)/kcminfo.po
 	test ! -f kcminfo.gmo || touch kcminfo.gmo
-kcmkwinrules.gmo: kcmkwinrules.po
-	rm -f kcmkwinrules.gmo; $(GMSGFMT) -o kcmkwinrules.gmo $(srcdir)/kcmkwinrules.po
-	test ! -f kcmkwinrules.gmo || touch kcmkwinrules.gmo
+kcmtwinrules.gmo: kcmtwinrules.po
+	rm -f kcmtwinrules.gmo; $(GMSGFMT) -o kcmtwinrules.gmo $(srcdir)/kcmtwinrules.po
+	test ! -f kcmtwinrules.gmo || touch kcmtwinrules.gmo
 kasbarextension.gmo: kasbarextension.po
 	rm -f kasbarextension.gmo; $(GMSGFMT) -o kasbarextension.gmo $(srcdir)/kasbarextension.po
 	test ! -f kasbarextension.gmo || touch kasbarextension.gmo
@@ -636,9 +636,9 @@ kio_remote.gmo: kio_remote.po
 kio_home.gmo: kio_home.po
 	rm -f kio_home.gmo; $(GMSGFMT) -o kio_home.gmo $(srcdir)/kio_home.po
 	test ! -f kio_home.gmo || touch kio_home.gmo
-kdeprintfax.gmo: kdeprintfax.po
-	rm -f kdeprintfax.gmo; $(GMSGFMT) -o kdeprintfax.gmo $(srcdir)/kdeprintfax.po
-	test ! -f kdeprintfax.gmo || touch kdeprintfax.gmo
+tdeprintfax.gmo: tdeprintfax.po
+	rm -f tdeprintfax.gmo; $(GMSGFMT) -o tdeprintfax.gmo $(srcdir)/tdeprintfax.po
+	test ! -f tdeprintfax.gmo || touch tdeprintfax.gmo
 kcmicons.gmo: kcmicons.po
 	rm -f kcmicons.gmo; $(GMSGFMT) -o kcmicons.gmo $(srcdir)/kcmicons.po
 	test ! -f kcmicons.gmo || touch kcmicons.gmo
@@ -678,9 +678,9 @@ kaccess.gmo: kaccess.po
 kio_pop3.gmo: kio_pop3.po
 	rm -f kio_pop3.gmo; $(GMSGFMT) -o kio_pop3.gmo $(srcdir)/kio_pop3.po
 	test ! -f kio_pop3.gmo || touch kio_pop3.gmo
-kdesud.gmo: kdesud.po
-	rm -f kdesud.gmo; $(GMSGFMT) -o kdesud.gmo $(srcdir)/kdesud.po
-	test ! -f kdesud.gmo || touch kdesud.gmo
+tdesud.gmo: tdesud.po
+	rm -f tdesud.gmo; $(GMSGFMT) -o tdesud.gmo $(srcdir)/tdesud.po
+	test ! -f tdesud.gmo || touch tdesud.gmo
 kio_fish.gmo: kio_fish.po
 	rm -f kio_fish.gmo; $(GMSGFMT) -o kio_fish.gmo $(srcdir)/kio_fish.po
 	test ! -f kio_fish.gmo || touch kio_fish.gmo
@@ -771,9 +771,9 @@ kcmlayout.gmo: kcmlayout.po
 kpager.gmo: kpager.po
 	rm -f kpager.gmo; $(GMSGFMT) -o kpager.gmo $(srcdir)/kpager.po
 	test ! -f kpager.gmo || touch kpager.gmo
-kwin_clients.gmo: kwin_clients.po
-	rm -f kwin_clients.gmo; $(GMSGFMT) -o kwin_clients.gmo $(srcdir)/kwin_clients.po
-	test ! -f kwin_clients.gmo || touch kwin_clients.gmo
+twin_clients.gmo: twin_clients.po
+	rm -f twin_clients.gmo; $(GMSGFMT) -o twin_clients.gmo $(srcdir)/twin_clients.po
+	test ! -f twin_clients.gmo || touch twin_clients.gmo
 kdebugdialog.gmo: kdebugdialog.po
 	rm -f kdebugdialog.gmo; $(GMSGFMT) -o kdebugdialog.gmo $(srcdir)/kdebugdialog.po
 	test ! -f kdebugdialog.gmo || touch kdebugdialog.gmo
@@ -804,9 +804,9 @@ libkickermenu_remotemenu.gmo: libkickermenu_remotemenu.po
 lockout.gmo: lockout.po
 	rm -f lockout.gmo; $(GMSGFMT) -o lockout.gmo $(srcdir)/lockout.po
 	test ! -f lockout.gmo || touch lockout.gmo
-kcmkwindecoration.gmo: kcmkwindecoration.po
-	rm -f kcmkwindecoration.gmo; $(GMSGFMT) -o kcmkwindecoration.gmo $(srcdir)/kcmkwindecoration.po
-	test ! -f kcmkwindecoration.gmo || touch kcmkwindecoration.gmo
+kcmtwindecoration.gmo: kcmtwindecoration.po
+	rm -f kcmtwindecoration.gmo; $(GMSGFMT) -o kcmtwindecoration.gmo $(srcdir)/kcmtwindecoration.po
+	test ! -f kcmtwindecoration.gmo || touch kcmtwindecoration.gmo
 kxkb.gmo: kxkb.po
 	rm -f kxkb.gmo; $(GMSGFMT) -o kxkb.gmo $(srcdir)/kxkb.po
 	test ! -f kxkb.gmo || touch kxkb.gmo
@@ -831,9 +831,9 @@ kcmnic.gmo: kcmnic.po
 privacy.gmo: privacy.po
 	rm -f privacy.gmo; $(GMSGFMT) -o privacy.gmo $(srcdir)/privacy.po
 	test ! -f privacy.gmo || touch privacy.gmo
-libkickermenu_kdeprint.gmo: libkickermenu_kdeprint.po
-	rm -f libkickermenu_kdeprint.gmo; $(GMSGFMT) -o libkickermenu_kdeprint.gmo $(srcdir)/libkickermenu_kdeprint.po
-	test ! -f libkickermenu_kdeprint.gmo || touch libkickermenu_kdeprint.gmo
+libkickermenu_tdeprint.gmo: libkickermenu_tdeprint.po
+	rm -f libkickermenu_tdeprint.gmo; $(GMSGFMT) -o libkickermenu_tdeprint.gmo $(srcdir)/libkickermenu_tdeprint.po
+	test ! -f libkickermenu_tdeprint.gmo || touch libkickermenu_tdeprint.gmo
 kscreensaver.gmo: kscreensaver.po
 	rm -f kscreensaver.gmo; $(GMSGFMT) -o kscreensaver.gmo $(srcdir)/kscreensaver.po
 	test ! -f kscreensaver.gmo || touch kscreensaver.gmo
@@ -870,9 +870,9 @@ ksystraycmd.gmo: ksystraycmd.po
 kcmsmartcard.gmo: kcmsmartcard.po
 	rm -f kcmsmartcard.gmo; $(GMSGFMT) -o kcmsmartcard.gmo $(srcdir)/kcmsmartcard.po
 	test ! -f kcmsmartcard.gmo || touch kcmsmartcard.gmo
-kwin.gmo: kwin.po
-	rm -f kwin.gmo; $(GMSGFMT) -o kwin.gmo $(srcdir)/kwin.po
-	test ! -f kwin.gmo || touch kwin.gmo
+twin.gmo: twin.po
+	rm -f twin.gmo; $(GMSGFMT) -o twin.gmo $(srcdir)/twin.po
+	test ! -f twin.gmo || touch twin.gmo
 libkicker.gmo: libkicker.po
 	rm -f libkicker.gmo; $(GMSGFMT) -o libkicker.gmo $(srcdir)/libkicker.po
 	test ! -f libkicker.gmo || touch libkicker.gmo
@@ -888,9 +888,9 @@ kgreet_winbind.gmo: kgreet_winbind.po
 drkonqi.gmo: drkonqi.po
 	rm -f drkonqi.gmo; $(GMSGFMT) -o drkonqi.gmo $(srcdir)/drkonqi.po
 	test ! -f drkonqi.gmo || touch drkonqi.gmo
-kwin_lib.gmo: kwin_lib.po
-	rm -f kwin_lib.gmo; $(GMSGFMT) -o kwin_lib.gmo $(srcdir)/kwin_lib.po
-	test ! -f kwin_lib.gmo || touch kwin_lib.gmo
+twin_lib.gmo: twin_lib.po
+	rm -f twin_lib.gmo; $(GMSGFMT) -o twin_lib.gmo $(srcdir)/twin_lib.po
+	test ! -f twin_lib.gmo || touch twin_lib.gmo
 kio_settings.gmo: kio_settings.po
 	rm -f kio_settings.gmo; $(GMSGFMT) -o kio_settings.gmo $(srcdir)/kio_settings.po
 	test ! -f kio_settings.gmo || touch kio_settings.gmo
@@ -906,9 +906,9 @@ kcmscreensaver.gmo: kcmscreensaver.po
 konqueror.gmo: konqueror.po
 	rm -f konqueror.gmo; $(GMSGFMT) -o konqueror.gmo $(srcdir)/konqueror.po
 	test ! -f konqueror.gmo || touch konqueror.gmo
-kdesu.gmo: kdesu.po
-	rm -f kdesu.gmo; $(GMSGFMT) -o kdesu.gmo $(srcdir)/kdesu.po
-	test ! -f kdesu.gmo || touch kdesu.gmo
+tdesu.gmo: tdesu.po
+	rm -f tdesu.gmo; $(GMSGFMT) -o tdesu.gmo $(srcdir)/tdesu.po
+	test ! -f tdesu.gmo || touch tdesu.gmo
 kcmsmserver.gmo: kcmsmserver.po
 	rm -f kcmsmserver.gmo; $(GMSGFMT) -o kcmsmserver.gmo $(srcdir)/kcmsmserver.po
 	test ! -f kcmsmserver.gmo || touch kcmsmserver.gmo
@@ -996,21 +996,21 @@ quicklauncher.gmo: quicklauncher.po
 kcmsamba.gmo: kcmsamba.po
 	rm -f kcmsamba.gmo; $(GMSGFMT) -o kcmsamba.gmo $(srcdir)/kcmsamba.po
 	test ! -f kcmsamba.gmo || touch kcmsamba.gmo
-kdeprint_part.gmo: kdeprint_part.po
-	rm -f kdeprint_part.gmo; $(GMSGFMT) -o kdeprint_part.gmo $(srcdir)/kdeprint_part.po
-	test ! -f kdeprint_part.gmo || touch kdeprint_part.gmo
+tdeprint_part.gmo: tdeprint_part.po
+	rm -f tdeprint_part.gmo; $(GMSGFMT) -o tdeprint_part.gmo $(srcdir)/tdeprint_part.po
+	test ! -f tdeprint_part.gmo || touch tdeprint_part.gmo
 kio_smtp.gmo: kio_smtp.po
 	rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po
 	test ! -f kio_smtp.gmo || touch kio_smtp.gmo
 
 #>+ 3
 clean-nls:
-	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
+	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmtwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo tdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo tdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo twin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmtwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_tdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo twin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo twin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo tdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo tdeprint_part.gmo kio_smtp.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \
+	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmtwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home tdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 tdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager twin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmtwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_tdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard twin libkicker khelpcenter ksmserver kgreet_winbind drkonqi twin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror tdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba tdeprint_part kio_smtp ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -1033,7 +1033,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kstyle_keramik_config.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlaunch.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminfo.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwinrules.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwinrules.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kasbarextension.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khtmlkttsd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libdmctl.mo
@@ -1054,7 +1054,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkded.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_remote.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_home.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprintfax.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprintfax.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmicons.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/filetypes.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmenergy.mo
@@ -1068,7 +1068,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ktip.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kaccess.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_pop3.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesud.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesud.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_fish.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkdnssd.mo
@@ -1099,7 +1099,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmlayout.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kpager.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_clients.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_clients.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdebugdialog.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnotify.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_nfs.mo
@@ -1110,7 +1110,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kay.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_remotemenu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/lockout.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkwindecoration.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmtwindecoration.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kxkb.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kprinter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libtaskmanager.mo
@@ -1119,7 +1119,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcrypto.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmnic.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/privacy.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_kdeprint.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_tdeprint.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkonq.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkickermenu_recentdocs.mo
@@ -1132,19 +1132,19 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_man.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksystraycmd.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmartcard.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkicker.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/khelpcenter.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kgreet_winbind.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/drkonqi.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kwin_lib.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/twin_lib.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_settings.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/ksysguard.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfontinst.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmscreensaver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/konqueror.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdesu.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdesu.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsmserver.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmcolors.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcminput.mo
@@ -1174,7 +1174,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmkonqhtml.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/quicklauncher.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdeprint_part.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo
 
 #>+ 2
@@ -1202,10 +1202,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/kdebase/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  messages/tdebase/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  messages/kdebase/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/kdebase/Makefile.in
+	  $(AUTOMAKE) --gnu  messages/tdebase/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin messages/tdebase/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-ja/messages/kdebase/drkonqi.po b/tde-i18n-ja/messages/kdebase/drkonqi.po
index 9edcd0a5832..3b485c7314c 100644
--- a/tde-i18n-ja/messages/kdebase/drkonqi.po
+++ b/tde-i18n-ja/messages/kdebase/drkonqi.po
@@ -172,8 +172,8 @@ msgid "Startup ID of the program"
 msgstr "プログラムの起動 ID"
 
 #: main.cpp:55
-msgid "The program was started by kdeinit"
-msgstr "プログラムは kdeinit によって起動されました"
+msgid "The program was started by tdeinit"
+msgstr "プログラムは tdeinit によって起動されました"
 
 #: main.cpp:56
 msgid "Disable arbitrary disk access"
diff --git a/tde-i18n-ja/messages/kdebase/kcmcrypto.po b/tde-i18n-ja/messages/kdebase/kcmcrypto.po
index dfb0b056011..61375fd6b07 100644
--- a/tde-i18n-ja/messages/kdebase/kcmcrypto.po
+++ b/tde-i18n-ja/messages/kdebase/kcmcrypto.po
@@ -662,9 +662,9 @@ msgstr "利用可能にしない"
 
 #: crypto.cpp:2012
 msgid ""
-"Could not execute Kleopatra. You might have to install or update the kdepim "
+"Could not execute Kleopatra. You might have to install or update the tdepim "
 "package."
-msgstr "Kleopatra を実行できませんでした。kdepim パッケージをインストールまたはアップデートしてください。"
+msgstr "Kleopatra を実行できませんでした。tdepim パッケージをインストールまたはアップデートしてください。"
 
 #: crypto.cpp:2030
 msgid ""
diff --git a/tde-i18n-ja/messages/kdebase/kcmkeys.po b/tde-i18n-ja/messages/kdebase/kcmkeys.po
index 32404fe48b1..e27d6e6865e 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkeys.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkeys.po
@@ -293,383 +293,383 @@ msgstr ""
 msgid "Application Missing"
 msgstr "アプリケーションがありません"
 
-#: ../../kwin/kwinbindings.cpp:18
+#: ../../twin/twinbindings.cpp:18
 msgid "System"
 msgstr "システム"
 
-#: ../../kwin/kwinbindings.cpp:20
+#: ../../twin/twinbindings.cpp:20
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: ../../kwin/kwinbindings.cpp:21
+#: ../../twin/twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "ウィンドウを巡回"
 
-#: ../../kwin/kwinbindings.cpp:22
+#: ../../twin/twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "ウィンドウを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:23
+#: ../../twin/twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "デスクトップを巡回"
 
-#: ../../kwin/kwinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "デスクトップを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "デスクトップリストを巡回"
 
-#: ../../kwin/kwinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "デスクトップリストを巡回 (反対回り)"
 
-#: ../../kwin/kwinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:28
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: ../../kwin/kwinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "ウィンドウ操作メニュー"
 
-#: ../../kwin/kwinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:30
 msgid "Close Window"
 msgstr "ウィンドウを閉じる"
 
-#: ../../kwin/kwinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "ウィンドウを最大化"
 
-#: ../../kwin/kwinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "ウィンドウを縦に最大化"
 
-#: ../../kwin/kwinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "ウィンドウを横に最大化"
 
-#: ../../kwin/kwinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "ウィンドウを最小化"
 
-#: ../../kwin/kwinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "ウィンドウをシェード"
 
-#: ../../kwin/kwinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:42
 msgid "Move Window"
 msgstr "ウィンドウを移動"
 
-#: ../../kwin/kwinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "ウィンドウをリサイズ"
 
-#: ../../kwin/kwinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "ウィンドウを前面に"
 
-#: ../../kwin/kwinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "ウィンドウを背面に"
 
-#: ../../kwin/kwinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "ウィンドウを前面/背面に"
 
-#: ../../kwin/kwinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "ウィンドウをフルスクリーンに"
 
-#: ../../kwin/kwinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "ウィンドウの枠を隠す"
 
-#: ../../kwin/kwinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "ウィンドウを常に他より上に"
 
-#: ../../kwin/kwinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "ウィンドウを常に他より下に"
 
-#: ../../kwin/kwinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "操作を要求しているウィンドウをアクティブに"
 
-#: ../../kwin/kwinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "ウィンドウショートカットの設定"
 
-#: ../../kwin/kwinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "ウィンドウを右寄せ"
 
-#: ../../kwin/kwinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "ウィンドウを左寄せ"
 
-#: ../../kwin/kwinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "ウィンドウを上寄せ"
 
-#: ../../kwin/kwinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "ウィンドウを下寄せ"
 
-#: ../../kwin/kwinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "ウィンドウを右へ伸ばす"
 
-#: ../../kwin/kwinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "ウィンドウを下へ伸ばす"
 
-#: ../../kwin/kwinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "ウィンドウを左へ縮める"
 
-#: ../../kwin/kwinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "ウィンドウを上へ縮める"
 
-#: ../../kwin/kwinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "ウィンドウをデスクトップへ移動"
 
-#: ../../kwin/kwinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "ウィンドウをすべてのデスクトップに配置"
 
-#: ../../kwin/kwinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "ウィンドウをデスクトップ 1 へ"
 
-#: ../../kwin/kwinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "ウィンドウをデスクトップ 2 へ"
 
-#: ../../kwin/kwinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "ウィンドウをデスクトップ 3 へ"
 
-#: ../../kwin/kwinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "ウィンドウをデスクトップ 4 へ"
 
-#: ../../kwin/kwinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "ウィンドウをデスクトップ 5 へ"
 
-#: ../../kwin/kwinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "ウィンドウをデスクトップ 6 へ"
 
-#: ../../kwin/kwinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "ウィンドウをデスクトップ 7 へ"
 
-#: ../../kwin/kwinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "ウィンドウをデスクトップ 8 へ"
 
-#: ../../kwin/kwinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "ウィンドウをデスクトップ 9 へ"
 
-#: ../../kwin/kwinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "ウィンドウをデスクトップ 10 へ"
 
-#: ../../kwin/kwinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "ウィンドウをデスクトップ 11 へ"
 
-#: ../../kwin/kwinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "ウィンドウをデスクトップ 12 へ"
 
-#: ../../kwin/kwinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "ウィンドウをデスクトップ 13 へ"
 
-#: ../../kwin/kwinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "ウィンドウをデスクトップ 14 へ"
 
-#: ../../kwin/kwinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "ウィンドウをデスクトップ 15 へ"
 
-#: ../../kwin/kwinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "ウィンドウをデスクトップ 16 へ"
 
-#: ../../kwin/kwinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "ウィンドウをデスクトップ 17 へ"
 
-#: ../../kwin/kwinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "ウィンドウをデスクトップ 18 へ"
 
-#: ../../kwin/kwinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "ウィンドウをデスクトップ 19 へ"
 
-#: ../../kwin/kwinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "ウィンドウをデスクトップ 20 へ"
 
-#: ../../kwin/kwinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "ウィンドウを次のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "ウィンドウを前のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "ウィンドウを一つ右のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "ウィンドウを一つ左のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "ウィンドウを一つ上のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "ウィンドウを一つ下のデスクトップへ"
 
-#: ../../kwin/kwinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "デスクトップの切り替え"
 
-#: ../../kwin/kwinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "デスクトップ 1 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "デスクトップ 2 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "デスクトップ 3 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "デスクトップ 4 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "デスクトップ 5 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "デスクトップ 6 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "デスクトップ 7 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "デスクトップ 8 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "デスクトップ 9 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "デスクトップ 10 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "デスクトップ 11 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "デスクトップ 12 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "デスクトップ 13 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "デスクトップ 14 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "デスクトップ 15 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "デスクトップ 16 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "デスクトップ 17 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "デスクトップ 18 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "デスクトップ 19 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "デスクトップ 20 に切り替え"
 
-#: ../../kwin/kwinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "次のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "前のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "一つ右のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "一つ左のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "一つ上のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "一つ下のデスクトップに切り替え"
 
-#: ../../kwin/kwinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "マウスエミュレーション"
 
-#: ../../kwin/kwinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "ウィンドウを強制終了"
 
-#: ../../kwin/kwinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "ウィンドウのスクリーンショット"
 
-#: ../../kwin/kwinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "デスクトップのスクリーンショット"
 
-#: ../../kwin/kwinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "グローバルショートカットをブロック"
 
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po b/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
index 75ca32affcf..001f48171f3 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwindecoration.po
@@ -1,4 +1,4 @@
-# translation of kcmkwindecoration.po to Japanese
+# translation of kcmtwindecoration.po to Japanese
 # Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # Taiki Komoda <kom@kde.gr.jp>, 2002.
 # Toyohiro Asukai <toyohiro@ksmplus.com>, 2004.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkwindecoration\n"
+"Project-Id-Version: kcmtwindecoration\n"
 "POT-Creation-Date: 2005-10-28 02:43+0200\n"
 "PO-Revision-Date: 2006-11-14 22:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -88,30 +88,30 @@ msgstr "メニュー"
 msgid "--- spacer ---"
 msgstr "--- スペーサー ---"
 
-#: kwindecoration.cpp:90
+#: twindecoration.cpp:90
 msgid ""
 "Select the window decoration. This is the look and feel of both the window "
 "borders and the window handle."
 msgstr "ウィンドウ装飾のテーマを選択してください。これはウィンドウの枠とハンドルの外観を決定します。"
 
-#: kwindecoration.cpp:95
+#: twindecoration.cpp:95
 msgid "Decoration Options"
 msgstr "装飾オプション"
 
-#: kwindecoration.cpp:105
+#: twindecoration.cpp:105
 msgid "B&order size:"
 msgstr "枠のサイズ(&O):"
 
-#: kwindecoration.cpp:108
+#: twindecoration.cpp:108
 msgid "Use this combobox to change the border size of the decoration."
 msgstr "このコンボボックスを使って、装飾の枠の大きさを変更します。"
 
 # ACCELERATOR changed by translator
-#: kwindecoration.cpp:124
+#: twindecoration.cpp:124
 msgid "&Show window button tooltips"
 msgstr "ウィンドウボタンにツールチップを表示する(&T)"
 
-#: kwindecoration.cpp:126
+#: twindecoration.cpp:126
 msgid ""
 "Enabling this checkbox will show window button tooltips. If this checkbox is "
 "off, no window button tooltips will be shown."
@@ -119,69 +119,69 @@ msgstr ""
 "このオプションを有効にすると、ウィンドウボタンの上にマウスカーソルを移動したときに、それぞれの機能がポップアップに表示されます。有効でない場合は、何も表示されま"
 "せん。"
 
-#: kwindecoration.cpp:130
+#: twindecoration.cpp:130
 msgid "Use custom titlebar button &positions"
 msgstr "タイトルバーのボタンの位置を指定する(&P)"
 
-#: kwindecoration.cpp:132
+#: twindecoration.cpp:132
 msgid ""
 "The appropriate settings can be found in the \"Buttons\" Tab; please note that "
 "this option is not available on all styles yet."
 msgstr "これに対応する設定項目は「ボタン」タブにあります。ただし、すべてのスタイルでこのオプションが使えるわけではありません。"
 
-#: kwindecoration.cpp:163
+#: twindecoration.cpp:163
 msgid "&Window Decoration"
 msgstr "ウィンドウ装飾(&W)"
 
-#: kwindecoration.cpp:164
+#: twindecoration.cpp:164
 msgid "&Buttons"
 msgstr "ボタン(&B)"
 
-#: kwindecoration.cpp:182
-msgid "kcmkwindecoration"
-msgstr "kcmkwindecoration"
+#: twindecoration.cpp:182
+msgid "kcmtwindecoration"
+msgstr "kcmtwindecoration"
 
-#: kwindecoration.cpp:183
+#: twindecoration.cpp:183
 msgid "Window Decoration Control Module"
 msgstr "ウィンドウ装飾コントロールモジュール"
 
-#: kwindecoration.cpp:185
+#: twindecoration.cpp:185
 msgid "(c) 2001 Karol Szwed"
 msgstr "(c) 2001 Karol Szwed"
 
-#: kwindecoration.cpp:237 kwindecoration.cpp:439
+#: twindecoration.cpp:237 twindecoration.cpp:439
 msgid "KDE 2"
 msgstr "KDE 2"
 
-#: kwindecoration.cpp:266
+#: twindecoration.cpp:266
 msgid "Tiny"
 msgstr "極小"
 
-#: kwindecoration.cpp:267
+#: twindecoration.cpp:267
 msgid "Normal"
 msgstr "標準"
 
-#: kwindecoration.cpp:268
+#: twindecoration.cpp:268
 msgid "Large"
 msgstr "大"
 
-#: kwindecoration.cpp:269
+#: twindecoration.cpp:269
 msgid "Very Large"
 msgstr "とても大"
 
-#: kwindecoration.cpp:270
+#: twindecoration.cpp:270
 msgid "Huge"
 msgstr "巨大"
 
-#: kwindecoration.cpp:271
+#: twindecoration.cpp:271
 msgid "Very Huge"
 msgstr "とても巨大"
 
-#: kwindecoration.cpp:272
+#: twindecoration.cpp:272
 msgid "Oversized"
 msgstr "特大"
 
-#: kwindecoration.cpp:591
+#: twindecoration.cpp:591
 msgid ""
 "<h1>Window Manager Decoration</h1>"
 "<p>This module allows you to choose the window border decorations, as well as "
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwinrules.po b/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
index 8f4c7355106..6a0590f24bd 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwinrules.po
@@ -1,11 +1,11 @@
-# translation of kcmkwinrules.po to Japanese
+# translation of kcmtwinrules.po to Japanese
 # Kenshi Muto <kmuto@debian.org>, 2004.
 # Fumiaki Okushi <fumiaki@okushi.com>, 2005.
 # Shinichi Tsunoda <tsuno@ngy.1st.ne.jp>, 2005.
 # Yukiko Bando <ybando@k6.dion.ne.jp>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkwinrules\n"
+"Project-Id-Version: kcmtwinrules\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -92,8 +92,8 @@ msgid "Unknown - will be treated as Normal Window"
 msgstr "不明 - 標準ウィンドウとして扱います"
 
 #: kcm.cpp:49
-msgid "kcmkwinrules"
-msgstr "kcmkwinrules"
+msgid "kcmtwinrules"
+msgstr "kcmtwinrules"
 
 #: kcm.cpp:50
 msgid "Window-Specific Settings Configuration Module"
diff --git a/tde-i18n-ja/messages/kdebase/kcmkwm.po b/tde-i18n-ja/messages/kdebase/kcmkwm.po
index aa24b85d2b2..7f4b477e42b 100644
--- a/tde-i18n-ja/messages/kdebase/kcmkwm.po
+++ b/tde-i18n-ja/messages/kdebase/kcmkwm.po
@@ -59,8 +59,8 @@ msgid "&Translucency"
 msgstr "半透明(&T)"
 
 #: main.cpp:126
-msgid "kcmkwinoptions"
-msgstr "kcmkwinoptions"
+msgid "kcmtwinoptions"
+msgstr "kcmtwinoptions"
 
 #: main.cpp:126
 msgid "Window Behavior Configuration Module"
@@ -939,7 +939,7 @@ msgid ""
 "<qt><b>It seems that alpha channel support is not available.</b>"
 "<br>"
 "<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with kwin."
+"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
 "<br>Also, make sure you have the following entries in your XConfig (e.g. "
 "/etc/X11/xorg.conf):"
 "<br>"
@@ -956,7 +956,7 @@ msgstr ""
 "<qt><b>アルファチャネルのサポートが利用できないようです。</b>"
 "<br>"
 "<br><a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a> "
-"と、kwin に同梱されている kompmgr がインストールされているか確認してください。"
+"と、twin に同梱されている kompmgr がインストールされているか確認してください。"
 "<br>また、XConfig (例えば /etc/X11/xorg.conf) に次のエントリがあることを確認してください:"
 "<br>"
 "<br><i>Section \"Extensions\""
diff --git a/tde-i18n-ja/messages/kdebase/kcmsmartcard.po b/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
index 1c0f8507299..a185a6ddfd2 100644
--- a/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
+++ b/tde-i18n-ja/messages/kdebase/kcmsmartcard.po
@@ -45,17 +45,17 @@ msgstr "考えられる理由"
 msgid ""
 "\n"
 "1) The KDE daemon, 'kded' is not running. You can restart it by running the "
-"command 'kdeinit' and then try reloading the KDE Control Center to see if this "
+"command 'tdeinit' and then try reloading the KDE Control Center to see if this "
 "message goes away.\n"
 "\n"
 "2) You don't appear to have smartcard support in the KDE libraries. You will "
-"need to recompile the kdelibs package with libpcsclite installed."
+"need to recompile the tdelibs package with libpcsclite installed."
 msgstr ""
 "\n"
-"1) KDE デーモン 'kded' が実行されていない。kdeinit コマンドで再起動してから、KDE "
+"1) KDE デーモン 'kded' が実行されていない。tdeinit コマンドで再起動してから、KDE "
 "コントロールセンターを再度立ち上げて、エラーメッセージが消えるかどうか試してみてください。\n"
 "\n"
-"2) KDE ライブラリにスマートカードサポートが含まれていない。libpcsclite をインストールしてから kdelibs "
+"2) KDE ライブラリにスマートカードサポートが含まれていない。libpcsclite をインストールしてから tdelibs "
 "をコンパイルし直す必要があります。"
 
 #. i18n: file smartcardbase.ui line 31
diff --git a/tde-i18n-ja/messages/kdebase/kdeprint_part.po b/tde-i18n-ja/messages/kdebase/kdeprint_part.po
index cebbe0b743c..9bcd9f82b9b 100644
--- a/tde-i18n-ja/messages/kdebase/kdeprint_part.po
+++ b/tde-i18n-ja/messages/kdebase/kdeprint_part.po
@@ -1,9 +1,9 @@
-# translation of kdeprint_part.po to Japanese.
+# translation of tdeprint_part.po to Japanese.
 # Noboru Sinohara <shinobo@leo.bekkoame.ne.jp>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprint_part VERSION\n"
+"Project-Id-Version: tdeprint_part VERSION\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2002-07-10 01:02+0900\n"
 "Last-Translator: Noboru Sinohara <shinobo@leo.bekkoame.ne.jp>\n"
@@ -26,14 +26,14 @@ msgid ""
 msgstr "shinobo@leo.bekkoame.ne.jp"
 
 #: printpart.cpp:59
-msgid "kdeprint_part"
-msgstr "kdeprint_part"
+msgid "tdeprint_part"
+msgstr "tdeprint_part"
 
 #: printpart.cpp:59
 msgid "A Konqueror Plugin for Print Management"
 msgstr "印刷管理のための Konqueror プラグイン"
 
-#. i18n: file kdeprint_part.rc line 3
+#. i18n: file tdeprint_part.rc line 3
 #: rc.cpp:3 rc.cpp:6
 #, no-c-format
 msgid "Print Manager Toolbar"
diff --git a/tde-i18n-ja/messages/kdebase/kdeprintfax.po b/tde-i18n-ja/messages/kdebase/kdeprintfax.po
index 18b42dd48a8..76b2c2dc985 100644
--- a/tde-i18n-ja/messages/kdebase/kdeprintfax.po
+++ b/tde-i18n-ja/messages/kdebase/kdeprintfax.po
@@ -1,4 +1,4 @@
-# translation of kdeprintfax.po to Japanese
+# translation of tdeprintfax.po to Japanese
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Toyohiro Asukai <toyohiro@ksmplus.com>, 2004.
 # Kurose Shushi <md81@bird.email.ne.jp>, 2004.
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeprintfax\n"
+"Project-Id-Version: tdeprintfax\n"
 "POT-Creation-Date: 2006-04-28 03:54+0200\n"
 "PO-Revision-Date: 2006-05-20 15:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -143,8 +143,8 @@ msgid ""
 msgstr "kom@kde.gr.jp,toyohiro@ksmplus.com,md81@bird.email.ne.jp"
 
 #: main.cpp:33
-msgid "A small fax utility to be used with kdeprint."
-msgstr "kdeprint で使用する小さなファクスユーティリティ"
+msgid "A small fax utility to be used with tdeprint."
+msgstr "tdeprint で使用する小さなファクスユーティリティ"
 
 #: main.cpp:39
 msgid "Phone number to fax to"
@@ -178,7 +178,7 @@ msgstr "MIME タイプ:"
 msgid "Command:"
 msgstr "コマンド:"
 
-#. i18n: file kdeprintfaxui.rc line 10
+#. i18n: file tdeprintfaxui.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Fa&x"
@@ -248,11 +248,11 @@ msgstr "フィルタ"
 msgid "Filters Configuration"
 msgstr "フィルタの設定"
 
-#: faxab.cpp:41 kdeprintfax.cpp:88
+#: faxab.cpp:41 tdeprintfax.cpp:88
 msgid "Name"
 msgstr "名前"
 
-#: faxab.cpp:42 kdeprintfax.cpp:87 kdeprintfax.cpp:562
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
 msgid "Fax Number"
 msgstr "ファクス番号"
 
@@ -268,143 +268,143 @@ msgstr "アドレス帳を編集(&E)"
 msgid "No fax number found in your address book."
 msgstr "アドレス帳にファクス番号が見つかりません。"
 
-#: kdeprintfax.cpp:74
+#: tdeprintfax.cpp:74
 msgid "Move up"
 msgstr "上に移動"
 
-#: kdeprintfax.cpp:79
+#: tdeprintfax.cpp:79
 msgid "Move down"
 msgstr "下に移動"
 
-#: kdeprintfax.cpp:82
+#: tdeprintfax.cpp:82
 msgid "F&iles:"
 msgstr "ファイル(&I):"
 
-#: kdeprintfax.cpp:89
+#: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "会社"
 
-#: kdeprintfax.cpp:96
+#: tdeprintfax.cpp:96
 msgid "Add fax number"
 msgstr "ファクス番号を追加"
 
-#: kdeprintfax.cpp:100
+#: tdeprintfax.cpp:100
 msgid "Add fax number from addressbook"
 msgstr "アドレス帳からファクス番号を追加"
 
-#: kdeprintfax.cpp:104
+#: tdeprintfax.cpp:104
 msgid "Remove fax number"
 msgstr "ファクス番号を削除"
 
-#: kdeprintfax.cpp:107
+#: tdeprintfax.cpp:107
 msgid "&Comment:"
 msgstr "コメント(&C):"
 
-#: kdeprintfax.cpp:118
+#: tdeprintfax.cpp:118
 msgid "Sched&ule:"
 msgstr "スケジュール(&U):"
 
-#: kdeprintfax.cpp:120
+#: tdeprintfax.cpp:120
 msgid "Now"
 msgstr "今"
 
-#: kdeprintfax.cpp:121
+#: tdeprintfax.cpp:121
 msgid "At Specified Time"
 msgstr "指定の時刻に"
 
-#: kdeprintfax.cpp:128
+#: tdeprintfax.cpp:128
 msgid "Send Co&ver Sheet"
 msgstr "表紙を送る(&V)"
 
-#: kdeprintfax.cpp:131
+#: tdeprintfax.cpp:131
 msgid "Su&bject:"
 msgstr "件名(&B):"
 
-#: kdeprintfax.cpp:172 kdeprintfax.cpp:252
+#: tdeprintfax.cpp:172 tdeprintfax.cpp:252
 msgid "Processing..."
 msgstr "処理中..."
 
-#: kdeprintfax.cpp:173 kdeprintfax.cpp:402
+#: tdeprintfax.cpp:173 tdeprintfax.cpp:402
 msgid "Idle"
 msgstr "アイドル中"
 
-#: kdeprintfax.cpp:177
+#: tdeprintfax.cpp:177
 msgid "Send to Fax"
 msgstr "ファクスに送信"
 
-#: kdeprintfax.cpp:191
+#: tdeprintfax.cpp:191
 msgid "&Add File..."
 msgstr "ファイルを追加(&A)..."
 
-#: kdeprintfax.cpp:192
+#: tdeprintfax.cpp:192
 msgid "&Remove File"
 msgstr "ファイルを削除(&R)"
 
-#: kdeprintfax.cpp:193
+#: tdeprintfax.cpp:193
 msgid "&Send Fax"
 msgstr "ファクスを送信(&S)"
 
-#: kdeprintfax.cpp:194
+#: tdeprintfax.cpp:194
 msgid "A&bort"
 msgstr "中止(&B)"
 
-#: kdeprintfax.cpp:195
+#: tdeprintfax.cpp:195
 msgid "A&ddress Book"
 msgstr "アドレス帳(&D)"
 
-#: kdeprintfax.cpp:196
+#: tdeprintfax.cpp:196
 msgid "V&iew Log"
 msgstr "ログを見る(&I)"
 
-#: kdeprintfax.cpp:197
+#: tdeprintfax.cpp:197
 msgid "Vi&ew File"
 msgstr "ファイルを見る(&E)..."
 
-#: kdeprintfax.cpp:198
+#: tdeprintfax.cpp:198
 msgid "&New Fax Recipient..."
 msgstr "新しいファクス受取人(&N)..."
 
-#: kdeprintfax.cpp:245
+#: tdeprintfax.cpp:245
 msgid "No file to fax."
 msgstr "ファクスするファイルがありません。"
 
-#: kdeprintfax.cpp:247
+#: tdeprintfax.cpp:247
 msgid "No fax number specified."
 msgstr "ファクス番号が指定されていません。"
 
-#: kdeprintfax.cpp:255
+#: tdeprintfax.cpp:255
 msgid "Unable to start Fax process."
 msgstr "ファクスプロセスを開始できません。"
 
-#: kdeprintfax.cpp:261
+#: tdeprintfax.cpp:261
 msgid "Unable to stop Fax process."
 msgstr "ファクスプロセスを終了できません。"
 
-#: kdeprintfax.cpp:284
+#: tdeprintfax.cpp:284
 #, c-format
 msgid "Unable to retrieve %1."
 msgstr "%1 を取得できません。"
 
-#: kdeprintfax.cpp:409
+#: tdeprintfax.cpp:409
 msgid "Fax error: see log message for more information."
 msgstr "ファクスエラー: 詳しい情報はログを見てください。"
 
-#: kdeprintfax.cpp:564
+#: tdeprintfax.cpp:564
 msgid "Enter recipient fax properties."
 msgstr "受取人のファクス情報を入力してください。"
 
-#: kdeprintfax.cpp:565
+#: tdeprintfax.cpp:565
 msgid "&Number:"
 msgstr "番号(&N):"
 
-#: kdeprintfax.cpp:566
+#: tdeprintfax.cpp:566
 msgid "N&ame:"
 msgstr "名前(&A):"
 
-#: kdeprintfax.cpp:567
+#: tdeprintfax.cpp:567
 msgid "&Enterprise:"
 msgstr "会社(&E):"
 
-#: kdeprintfax.cpp:593
+#: tdeprintfax.cpp:593
 msgid "Invalid fax number."
 msgstr "無効なファクス番号です。"
diff --git a/tde-i18n-ja/messages/kdebase/kdesu.po b/tde-i18n-ja/messages/kdebase/kdesu.po
index 51395b2ee36..8fbed73cb76 100644
--- a/tde-i18n-ja/messages/kdebase/kdesu.po
+++ b/tde-i18n-ja/messages/kdebase/kdesu.po
@@ -1,4 +1,4 @@
-# translation of kdesu.po to Japanese
+# translation of tdesu.po to Japanese
 # KTranslator Generated File
 # Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # Noboru Sinohara <shinobo@leo.bekkoame.ne.jp>, 2002.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdesu\n"
+"Project-Id-Version: tdesu\n"
 "POT-Creation-Date: 2007-11-14 01:15+0100\n"
 "PO-Revision-Date: 2007-04-13 18:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -19,98 +19,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: kdesu.cpp:56 kdesu.cpp:57
+#: tdesu.cpp:56 tdesu.cpp:57
 msgid "Specifies the command to run"
 msgstr "実行するコマンドを指定"
 
-#: kdesu.cpp:58
+#: tdesu.cpp:58
 msgid "Run command under target uid if <file> is not writable"
 msgstr "<file> が書き込み不可であればターゲット uid でコマンドを実行"
 
-#: kdesu.cpp:59
+#: tdesu.cpp:59
 msgid "Specifies the target uid"
 msgstr "ターゲット uid を指定"
 
-#: kdesu.cpp:60
+#: tdesu.cpp:60
 msgid "Do not keep password"
 msgstr "パスワードを保持しない"
 
-#: kdesu.cpp:61
+#: tdesu.cpp:61
 msgid "Stop the daemon (forgets all passwords)"
 msgstr "デーモンを停止 (すべてのパスワードを消去)"
 
-#: kdesu.cpp:62
+#: tdesu.cpp:62
 msgid "Enable terminal output (no password keeping)"
 msgstr "端末出力を有効に (パスワードは保持しない)"
 
-#: kdesu.cpp:63
+#: tdesu.cpp:63
 msgid "Set priority value: 0 <= prio <= 100, 0 is lowest"
 msgstr "優先度の設定: 0 <= 優先度 <= 100、0 が最小"
 
-#: kdesu.cpp:64
+#: tdesu.cpp:64
 msgid "Use realtime scheduling"
 msgstr "リアルタイムスケジューリングを使う"
 
-#: kdesu.cpp:65
+#: tdesu.cpp:65
 msgid "Let command use existing dcopserver"
 msgstr "コマンドに既存の DCOP サーバを使わせる"
 
-#: kdesu.cpp:66
+#: tdesu.cpp:66
 msgid "Do not display ignore button"
 msgstr "「無視」ボタンを表示しない"
 
-#: kdesu.cpp:67
+#: tdesu.cpp:67
 msgid "Specify icon to use in the password dialog"
 msgstr "パスワードダイアログで使用するアイコンを指定する"
 
-#: kdesu.cpp:68
+#: tdesu.cpp:68
 msgid "Do not show the command to be run in the dialog"
 msgstr "ダイアログで実行されるコマンドを表示しない"
 
-#: kdesu.cpp:99
+#: tdesu.cpp:99
 msgid "KDE su"
 msgstr "KDE su"
 
-#: kdesu.cpp:100
+#: tdesu.cpp:100
 msgid "Runs a program with elevated privileges."
 msgstr "上位の権限でプログラムを実行します。"
 
-#: kdesu.cpp:103
+#: tdesu.cpp:103
 msgid "Maintainer"
 msgstr "メンテナ"
 
-#: kdesu.cpp:105
+#: tdesu.cpp:105
 msgid "Original author"
 msgstr "オリジナルの作者"
 
-#: kdesu.cpp:131
+#: tdesu.cpp:131
 msgid "Command '%1' not found."
 msgstr "コマンド '%1' が見つかりません。"
 
-#: kdesu.cpp:207
+#: tdesu.cpp:207
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "無効な優先度: %1"
 
-#: kdesu.cpp:235
+#: tdesu.cpp:235
 msgid "No command specified."
 msgstr "コマンドが指定されていません。"
 
-#: kdesu.cpp:344
+#: tdesu.cpp:344
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "su がエラーを返しました。\n"
 
-#: kdesu.cpp:365
+#: tdesu.cpp:365
 msgid "Command:"
 msgstr "コマンド:"
 
-#: kdesu.cpp:370
+#: tdesu.cpp:370
 msgid "realtime: "
 msgstr "リアルタイム:"
 
-#: kdesu.cpp:373
+#: tdesu.cpp:373
 msgid "Priority:"
 msgstr "優先度:"
 
diff --git a/tde-i18n-ja/messages/kdebase/kdesud.po b/tde-i18n-ja/messages/kdebase/kdesud.po
index 944d7a7ae6c..e9e63be352d 100644
--- a/tde-i18n-ja/messages/kdebase/kdesud.po
+++ b/tde-i18n-ja/messages/kdebase/kdesud.po
@@ -1,9 +1,9 @@
-# translation of kdesud.po to Japanese.
+# translation of tdesud.po to Japanese.
 # Sinohara <shinobo@leo.bekkoame.ne.jp>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdesud VERSION\n"
+"Project-Id-Version: tdesud VERSION\n"
 "POT-Creation-Date: 2005-07-23 01:32+0200\n"
 "PO-Revision-Date: 2001-01-10 23:12GMT\n"
 "Last-Translator: Sinohara <shinobo@leo.bekkoame.ne.jp>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.7.1\n"
 
-#: kdesud.cpp:251
+#: tdesud.cpp:251
 msgid "KDE su daemon"
 msgstr "KDE su デーモン"
 
-#: kdesud.cpp:252
-msgid "Daemon used by kdesu"
-msgstr "kdesu が使用するデーモン"
+#: tdesud.cpp:252
+msgid "Daemon used by tdesu"
+msgstr "tdesu が使用するデーモン"
 
-#: kdesud.cpp:255
+#: tdesud.cpp:255
 msgid "Author"
 msgstr "作者"
 
diff --git a/tde-i18n-ja/messages/kdebase/ksmserver.po b/tde-i18n-ja/messages/kdebase/ksmserver.po
index d9c4ecb5583..ee0898183d0 100644
--- a/tde-i18n-ja/messages/kdebase/ksmserver.po
+++ b/tde-i18n-ja/messages/kdebase/ksmserver.po
@@ -48,10 +48,10 @@ msgstr "可能なら保存されたセッションを復元"
 #: main.cpp:37
 msgid ""
 "Starts 'wm' in case no other window manager is \n"
-"participating in the session. Default is 'kwin'"
+"participating in the session. Default is 'twin'"
 msgstr ""
 "他のウィンドウマネージャが存在しないときに\n"
-"'wm' を起動します。標準では 'kwin' です。"
+"'wm' を起動します。標準では 'twin' です。"
 
 #: main.cpp:38
 msgid "Also allow remote connections"
diff --git a/tde-i18n-ja/messages/kdebase/ktip.po b/tde-i18n-ja/messages/kdebase/ktip.po
index 84b4161a884..a77b45d4131 100644
--- a/tde-i18n-ja/messages/kdebase/ktip.po
+++ b/tde-i18n-ja/messages/kdebase/ktip.po
@@ -51,7 +51,7 @@ msgid ""
 "also useful sites for major applications like\n"
 "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
 "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>, or important\n"
+"<A HREF=\"http://www.tdevelop.org/\">KDevelop</A>, or important\n"
 "KDE utilities like\n"
 "<A HREF=\"http://printing.kde.org/\">KDEPrint</A>,\n"
 "which can be put to its full usage even outside KDE...\n"
@@ -65,7 +65,7 @@ msgstr ""
 "KDE に関する多くの情報は <A HREF=\"http://www.kde.org/\">KDE ウェブサイト</A> "
 "で入手できます。主要なアプリケーションについては <A HREF=\"http://www.konqueror.org/\">Konqueror</A>"
 ", <A HREF=\"http://www.koffice.org/\">KOffice</A>, <A "
-"HREF=\"http://www.kdevelop.org/\">KDevelop</A> のような役立つサイトもあります。また、<A "
+"HREF=\"http://www.tdevelop.org/\">KDevelop</A> のような役立つサイトもあります。また、<A "
 "HREF=\"http://printing.kde.org/\">KDEPrint</A> のような KDE "
 "以外でも使用できるユーティリティに関するサイトもあります。</p>\n"
 "<br>\n"
@@ -540,7 +540,7 @@ msgid ""
 "<p>\n"
 "Need comprehensive info about KDEPrinting?"
 "<br> </p>\n"
-"<p> Type <strong>help:/kdeprint/</strong> into a Konqueror address field\n"
+"<p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field\n"
 "and get the\n"
 " <a href=\"http://printing.kde.org/documentation/handbook/\">"
 "KDEPrint Handbook</a>\n"
@@ -550,7 +550,7 @@ msgid ""
 " <a href=\"http://printing.kde.org/documentation/tutorials/\">Tutorials</a>,\n"
 "a \"TipsNTricks\" section and the\n"
 " <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"kdeprint mailing list</a>)\n"
+"tdeprint mailing list</a>)\n"
 " are available at\n"
 "<a href=\"http://printing.kde.org/\">printing.kde.org</a>...\n"
 "</p>\n"
@@ -560,7 +560,7 @@ msgstr ""
 "<p>\n"
 "KDEPrinting に関する総合的な情報が必要ですか？"
 "<br></p>\n"
-"<p>Konqueror のアドレスフィールドに <strong>help:/kdeprint/</strong> "
+"<p>Konqueror のアドレスフィールドに <strong>help:/tdeprint/</strong> "
 "と入力すると、<a href=\"http://printing.kde.org/documentation/handbook/\">"
 "KDEPrint ハンドブック</a>\n"
 "が開きます。</p>"
@@ -568,7 +568,7 @@ msgstr ""
 "では、この他にも <a href=\"http://printing.kde.org/faq/\">FAQ</a>"
 "、<a href=\"http://printing.kde.org/documentation/tutorials/\">さまざまなチュートリアル</a>"
 "、「ヒントと小技」、そして <a href=\"http://mail.kde.org/mailman/listinfo/kde-print/\">"
-"kdeprint メーリングリスト</a> などをご利用いただけます。</p>\n"
+"tdeprint メーリングリスト</a> などをご利用いただけます。</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 
@@ -793,7 +793,7 @@ msgid ""
 "<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
 "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
 " StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
-"<p>See <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>See <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a>\n"
 "for more detailed hints...\n"
 "</p>\n"
@@ -804,7 +804,7 @@ msgstr ""
 "<p>KDE の印刷機能は KDE 以外のアプリケーションでも利用できます。</p>\n"
 "<p><strong>'kprinter'</strong> を印刷コマンドとして使ってください。Netscape, Mozzila, Galeon, gv, "
 "AcrobatReader, StarOffice, OpenOffice, さらに GNOME アプリケーションその他でも使用できます。</p>\n"
-"<p>詳細については <a href=\"http://printing.kde.org/faq/kdeprint.phtml#out\">"
+"<p>詳細については <a href=\"http://printing.kde.org/faq/tdeprint.phtml#out\">"
 "printing.kde.org</a> を参照してください。</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
@@ -920,7 +920,7 @@ msgid ""
 "You may specify print files and/or name a printer from the command line:\n"
 "<pre>\n"
 "kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
-"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
+"../tdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
 "</pre>\n"
 " This prints 3 different files (from different folders) to printer "
 "\"infotec\".\n"
@@ -933,7 +933,7 @@ msgstr ""
 "<p>\n"
 "コマンドラインからでも印刷するファイルやプリンタ名を指定できます:\n"
 "<pre> kprinter -d infotec \\\n          /home/kurt/paragliding.jpg \\\n "
-"../kdeprint-handbook.pdf \\\n          /opt/kde3/flyer.ps\n"
+"../tdeprint-handbook.pdf \\\n          /opt/kde3/flyer.ps\n"
 "</pre>\n"
 "このようにすると、異なるフォルダにある 3 つのファイルをプリンタ \"infosec\" で印刷します。\n"
 "</p>\n"
diff --git a/tde-i18n-ja/messages/kdebase/kwin.po b/tde-i18n-ja/messages/kdebase/kwin.po
index 991e7f9bc2b..37edc7e8732 100644
--- a/tde-i18n-ja/messages/kdebase/kwin.po
+++ b/tde-i18n-ja/messages/kdebase/kwin.po
@@ -1,4 +1,4 @@
-# translation of kwin.po to Japanese
+# translation of twin.po to Japanese
 # KTranslator Generated File
 # Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
@@ -10,7 +10,7 @@
 # Yukiko Bando <ybando@k6.dion.ne.jp>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin\n"
+"Project-Id-Version: twin\n"
 "POT-Creation-Date: 2008-03-10 01:27+0100\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
@@ -39,403 +39,403 @@ msgstr ""
 msgid "Window '%1' demands attention."
 msgstr "ウィンドウ '%1' が操作を要求しています。"
 
-#: kwinbindings.cpp:18
+#: twinbindings.cpp:18
 msgid "System"
 msgstr "システム"
 
-#: kwinbindings.cpp:20
+#: twinbindings.cpp:20
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: kwinbindings.cpp:21
+#: twinbindings.cpp:21
 msgid "Walk Through Windows"
 msgstr "ウィンドウを巡回"
 
-#: kwinbindings.cpp:22
+#: twinbindings.cpp:22
 msgid "Walk Through Windows (Reverse)"
 msgstr "ウィンドウを巡回 (反対回り)"
 
-#: kwinbindings.cpp:23
+#: twinbindings.cpp:23
 msgid "Walk Through Desktops"
 msgstr "デスクトップを巡回"
 
-#: kwinbindings.cpp:24
+#: twinbindings.cpp:24
 msgid "Walk Through Desktops (Reverse)"
 msgstr "デスクトップを巡回 (反対回り)"
 
-#: kwinbindings.cpp:25
+#: twinbindings.cpp:25
 msgid "Walk Through Desktop List"
 msgstr "デスクトップリストを巡回"
 
-#: kwinbindings.cpp:26
+#: twinbindings.cpp:26
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "デスクトップリストを巡回 (反対回り)"
 
-#: kwinbindings.cpp:28
+#: twinbindings.cpp:28
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: kwinbindings.cpp:29
+#: twinbindings.cpp:29
 msgid "Window Operations Menu"
 msgstr "ウィンドウ操作メニュー"
 
-#: kwinbindings.cpp:30
+#: twinbindings.cpp:30
 msgid "Close Window"
 msgstr "ウィンドウを閉じる"
 
-#: kwinbindings.cpp:32
+#: twinbindings.cpp:32
 msgid "Maximize Window"
 msgstr "ウィンドウを最大化"
 
-#: kwinbindings.cpp:34
+#: twinbindings.cpp:34
 msgid "Maximize Window Vertically"
 msgstr "ウィンドウを縦に最大化"
 
-#: kwinbindings.cpp:36
+#: twinbindings.cpp:36
 msgid "Maximize Window Horizontally"
 msgstr "ウィンドウを横に最大化"
 
-#: kwinbindings.cpp:38
+#: twinbindings.cpp:38
 msgid "Minimize Window"
 msgstr "ウィンドウを最小化"
 
-#: kwinbindings.cpp:40
+#: twinbindings.cpp:40
 msgid "Shade Window"
 msgstr "ウィンドウをシェード"
 
-#: kwinbindings.cpp:42
+#: twinbindings.cpp:42
 msgid "Move Window"
 msgstr "ウィンドウを移動"
 
-#: kwinbindings.cpp:44
+#: twinbindings.cpp:44
 msgid "Resize Window"
 msgstr "ウィンドウをリサイズ"
 
-#: kwinbindings.cpp:46
+#: twinbindings.cpp:46
 msgid "Raise Window"
 msgstr "ウィンドウを前面に"
 
-#: kwinbindings.cpp:48
+#: twinbindings.cpp:48
 msgid "Lower Window"
 msgstr "ウィンドウを背面に"
 
-#: kwinbindings.cpp:50
+#: twinbindings.cpp:50
 msgid "Toggle Window Raise/Lower"
 msgstr "ウィンドウを前面/背面に"
 
-#: kwinbindings.cpp:51
+#: twinbindings.cpp:51
 msgid "Make Window Fullscreen"
 msgstr "ウィンドウをフルスクリーンに"
 
-#: kwinbindings.cpp:53
+#: twinbindings.cpp:53
 msgid "Hide Window Border"
 msgstr "ウィンドウの枠を隠す"
 
-#: kwinbindings.cpp:55
+#: twinbindings.cpp:55
 msgid "Keep Window Above Others"
 msgstr "ウィンドウを常に他より上に"
 
-#: kwinbindings.cpp:57
+#: twinbindings.cpp:57
 msgid "Keep Window Below Others"
 msgstr "ウィンドウを常に他より下に"
 
-#: kwinbindings.cpp:59
+#: twinbindings.cpp:59
 msgid "Activate Window Demanding Attention"
 msgstr "操作を要求しているウィンドウをアクティブに"
 
-#: kwinbindings.cpp:60
+#: twinbindings.cpp:60
 msgid "Setup Window Shortcut"
 msgstr "ウィンドウショートカットの設定"
 
-#: kwinbindings.cpp:61
+#: twinbindings.cpp:61
 msgid "Pack Window to the Right"
 msgstr "ウィンドウを右寄せ"
 
-#: kwinbindings.cpp:63
+#: twinbindings.cpp:63
 msgid "Pack Window to the Left"
 msgstr "ウィンドウを左寄せ"
 
-#: kwinbindings.cpp:65
+#: twinbindings.cpp:65
 msgid "Pack Window Up"
 msgstr "ウィンドウを上寄せ"
 
-#: kwinbindings.cpp:67
+#: twinbindings.cpp:67
 msgid "Pack Window Down"
 msgstr "ウィンドウを下寄せ"
 
-#: kwinbindings.cpp:69
+#: twinbindings.cpp:69
 msgid "Pack Grow Window Horizontally"
 msgstr "ウィンドウを右へ伸ばす"
 
-#: kwinbindings.cpp:71
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Vertically"
 msgstr "ウィンドウを下へ伸ばす"
 
-#: kwinbindings.cpp:73
+#: twinbindings.cpp:73
 msgid "Pack Shrink Window Horizontally"
 msgstr "ウィンドウを左へ縮める"
 
-#: kwinbindings.cpp:75
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Vertically"
 msgstr "ウィンドウを上へ縮める"
 
-#: kwinbindings.cpp:78
+#: twinbindings.cpp:78
 msgid "Window & Desktop"
 msgstr "ウィンドウをデスクトップへ移動"
 
-#: kwinbindings.cpp:79
+#: twinbindings.cpp:79
 msgid "Keep Window on All Desktops"
 msgstr "ウィンドウをすべてのデスクトップに配置"
 
-#: kwinbindings.cpp:81
+#: twinbindings.cpp:81
 msgid "Window to Desktop 1"
 msgstr "ウィンドウをデスクトップ 1 へ"
 
-#: kwinbindings.cpp:82
+#: twinbindings.cpp:82
 msgid "Window to Desktop 2"
 msgstr "ウィンドウをデスクトップ 2 へ"
 
-#: kwinbindings.cpp:83
+#: twinbindings.cpp:83
 msgid "Window to Desktop 3"
 msgstr "ウィンドウをデスクトップ 3 へ"
 
-#: kwinbindings.cpp:84
+#: twinbindings.cpp:84
 msgid "Window to Desktop 4"
 msgstr "ウィンドウをデスクトップ 4 へ"
 
-#: kwinbindings.cpp:85
+#: twinbindings.cpp:85
 msgid "Window to Desktop 5"
 msgstr "ウィンドウをデスクトップ 5 へ"
 
-#: kwinbindings.cpp:86
+#: twinbindings.cpp:86
 msgid "Window to Desktop 6"
 msgstr "ウィンドウをデスクトップ 6 へ"
 
-#: kwinbindings.cpp:87
+#: twinbindings.cpp:87
 msgid "Window to Desktop 7"
 msgstr "ウィンドウをデスクトップ 7 へ"
 
-#: kwinbindings.cpp:88
+#: twinbindings.cpp:88
 msgid "Window to Desktop 8"
 msgstr "ウィンドウをデスクトップ 8 へ"
 
-#: kwinbindings.cpp:89
+#: twinbindings.cpp:89
 msgid "Window to Desktop 9"
 msgstr "ウィンドウをデスクトップ 9 へ"
 
-#: kwinbindings.cpp:90
+#: twinbindings.cpp:90
 msgid "Window to Desktop 10"
 msgstr "ウィンドウをデスクトップ 10 へ"
 
-#: kwinbindings.cpp:91
+#: twinbindings.cpp:91
 msgid "Window to Desktop 11"
 msgstr "ウィンドウをデスクトップ 11 へ"
 
-#: kwinbindings.cpp:92
+#: twinbindings.cpp:92
 msgid "Window to Desktop 12"
 msgstr "ウィンドウをデスクトップ 12 へ"
 
-#: kwinbindings.cpp:93
+#: twinbindings.cpp:93
 msgid "Window to Desktop 13"
 msgstr "ウィンドウをデスクトップ 13 へ"
 
-#: kwinbindings.cpp:94
+#: twinbindings.cpp:94
 msgid "Window to Desktop 14"
 msgstr "ウィンドウをデスクトップ 14 へ"
 
-#: kwinbindings.cpp:95
+#: twinbindings.cpp:95
 msgid "Window to Desktop 15"
 msgstr "ウィンドウをデスクトップ 15 へ"
 
-#: kwinbindings.cpp:96
+#: twinbindings.cpp:96
 msgid "Window to Desktop 16"
 msgstr "ウィンドウをデスクトップ 16 へ"
 
-#: kwinbindings.cpp:97
+#: twinbindings.cpp:97
 msgid "Window to Desktop 17"
 msgstr "ウィンドウをデスクトップ 17 へ"
 
-#: kwinbindings.cpp:98
+#: twinbindings.cpp:98
 msgid "Window to Desktop 18"
 msgstr "ウィンドウをデスクトップ 18 へ"
 
-#: kwinbindings.cpp:99
+#: twinbindings.cpp:99
 msgid "Window to Desktop 19"
 msgstr "ウィンドウをデスクトップ 19 へ"
 
-#: kwinbindings.cpp:100
+#: twinbindings.cpp:100
 msgid "Window to Desktop 20"
 msgstr "ウィンドウをデスクトップ 20 へ"
 
-#: kwinbindings.cpp:101
+#: twinbindings.cpp:101
 msgid "Window to Next Desktop"
 msgstr "ウィンドウを次のデスクトップへ"
 
-#: kwinbindings.cpp:102
+#: twinbindings.cpp:102
 msgid "Window to Previous Desktop"
 msgstr "ウィンドウを前のデスクトップへ"
 
-#: kwinbindings.cpp:103
+#: twinbindings.cpp:103
 msgid "Window One Desktop to the Right"
 msgstr "ウィンドウを一つ右のデスクトップへ"
 
-#: kwinbindings.cpp:104
+#: twinbindings.cpp:104
 msgid "Window One Desktop to the Left"
 msgstr "ウィンドウを一つ左のデスクトップへ"
 
-#: kwinbindings.cpp:105
+#: twinbindings.cpp:105
 msgid "Window One Desktop Up"
 msgstr "ウィンドウを一つ上のデスクトップへ"
 
-#: kwinbindings.cpp:106
+#: twinbindings.cpp:106
 msgid "Window One Desktop Down"
 msgstr "ウィンドウを一つ下のデスクトップへ"
 
-#: kwinbindings.cpp:108
+#: twinbindings.cpp:108
 msgid "Desktop Switching"
 msgstr "デスクトップの切り替え"
 
-#: kwinbindings.cpp:109
+#: twinbindings.cpp:109
 msgid "Switch to Desktop 1"
 msgstr "デスクトップ 1 に切り替え"
 
-#: kwinbindings.cpp:110
+#: twinbindings.cpp:110
 msgid "Switch to Desktop 2"
 msgstr "デスクトップ 2 に切り替え"
 
-#: kwinbindings.cpp:111
+#: twinbindings.cpp:111
 msgid "Switch to Desktop 3"
 msgstr "デスクトップ 3 に切り替え"
 
-#: kwinbindings.cpp:112
+#: twinbindings.cpp:112
 msgid "Switch to Desktop 4"
 msgstr "デスクトップ 4 に切り替え"
 
-#: kwinbindings.cpp:113
+#: twinbindings.cpp:113
 msgid "Switch to Desktop 5"
 msgstr "デスクトップ 5 に切り替え"
 
-#: kwinbindings.cpp:114
+#: twinbindings.cpp:114
 msgid "Switch to Desktop 6"
 msgstr "デスクトップ 6 に切り替え"
 
-#: kwinbindings.cpp:115
+#: twinbindings.cpp:115
 msgid "Switch to Desktop 7"
 msgstr "デスクトップ 7 に切り替え"
 
-#: kwinbindings.cpp:116
+#: twinbindings.cpp:116
 msgid "Switch to Desktop 8"
 msgstr "デスクトップ 8 に切り替え"
 
-#: kwinbindings.cpp:117
+#: twinbindings.cpp:117
 msgid "Switch to Desktop 9"
 msgstr "デスクトップ 9 に切り替え"
 
-#: kwinbindings.cpp:118
+#: twinbindings.cpp:118
 msgid "Switch to Desktop 10"
 msgstr "デスクトップ 10 に切り替え"
 
-#: kwinbindings.cpp:119
+#: twinbindings.cpp:119
 msgid "Switch to Desktop 11"
 msgstr "デスクトップ 11 に切り替え"
 
-#: kwinbindings.cpp:120
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 12"
 msgstr "デスクトップ 12 に切り替え"
 
-#: kwinbindings.cpp:121
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 13"
 msgstr "デスクトップ 13 に切り替え"
 
-#: kwinbindings.cpp:122
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 14"
 msgstr "デスクトップ 14 に切り替え"
 
-#: kwinbindings.cpp:123
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 15"
 msgstr "デスクトップ 15 に切り替え"
 
-#: kwinbindings.cpp:124
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 16"
 msgstr "デスクトップ 16 に切り替え"
 
-#: kwinbindings.cpp:125
+#: twinbindings.cpp:125
 msgid "Switch to Desktop 17"
 msgstr "デスクトップ 17 に切り替え"
 
-#: kwinbindings.cpp:126
+#: twinbindings.cpp:126
 msgid "Switch to Desktop 18"
 msgstr "デスクトップ 18 に切り替え"
 
-#: kwinbindings.cpp:127
+#: twinbindings.cpp:127
 msgid "Switch to Desktop 19"
 msgstr "デスクトップ 19 に切り替え"
 
-#: kwinbindings.cpp:128
+#: twinbindings.cpp:128
 msgid "Switch to Desktop 20"
 msgstr "デスクトップ 20 に切り替え"
 
-#: kwinbindings.cpp:129
+#: twinbindings.cpp:129
 msgid "Switch to Next Desktop"
 msgstr "次のデスクトップに切り替え"
 
-#: kwinbindings.cpp:130
+#: twinbindings.cpp:130
 msgid "Switch to Previous Desktop"
 msgstr "前のデスクトップに切り替え"
 
-#: kwinbindings.cpp:131
+#: twinbindings.cpp:131
 msgid "Switch One Desktop to the Right"
 msgstr "一つ右のデスクトップに切り替え"
 
-#: kwinbindings.cpp:132
+#: twinbindings.cpp:132
 msgid "Switch One Desktop to the Left"
 msgstr "一つ左のデスクトップに切り替え"
 
-#: kwinbindings.cpp:133
+#: twinbindings.cpp:133
 msgid "Switch One Desktop Up"
 msgstr "一つ上のデスクトップに切り替え"
 
-#: kwinbindings.cpp:134
+#: twinbindings.cpp:134
 msgid "Switch One Desktop Down"
 msgstr "一つ下のデスクトップに切り替え"
 
-#: kwinbindings.cpp:137
+#: twinbindings.cpp:137
 msgid "Mouse Emulation"
 msgstr "マウスエミュレーション"
 
-#: kwinbindings.cpp:138
+#: twinbindings.cpp:138
 msgid "Kill Window"
 msgstr "ウィンドウを強制終了"
 
-#: kwinbindings.cpp:139
+#: twinbindings.cpp:139
 msgid "Window Screenshot"
 msgstr "ウィンドウのスクリーンショット"
 
-#: kwinbindings.cpp:140
+#: twinbindings.cpp:140
 msgid "Desktop Screenshot"
 msgstr "デスクトップのスクリーンショット"
 
-#: kwinbindings.cpp:145
+#: twinbindings.cpp:145
 msgid "Block Global Shortcuts"
 msgstr "グローバルショートカットをブロック"
 
 #: main.cpp:65
 msgid ""
-"kwin: it looks like there's already a window manager running. kwin not "
+"twin: it looks like there's already a window manager running. twin not "
 "started.\n"
 msgstr ""
-"kwin: 既にウィンドウマネージャが実行中のようです。kwin は起動しません。\n"
+"twin: 既にウィンドウマネージャが実行中のようです。twin は起動しません。\n"
 
 #: main.cpp:80
-msgid "kwin: failure during initialization; aborting"
-msgstr "kwin: 初期化失敗、起動を中止します"
+msgid "twin: failure during initialization; aborting"
+msgstr "twin: 初期化失敗、起動を中止します"
 
 #: main.cpp:101
 msgid ""
-"kwin: unable to claim manager selection, another wm running? (try using "
+"twin: unable to claim manager selection, another wm running? (try using "
 "--replace)\n"
 msgstr ""
-"kwin: ウィンドウマネージャになれませんでした。他のマネージャが実行中？ (\"--replace\" で試してみてください。)\n"
+"twin: ウィンドウマネージャになれませんでした。他のマネージャが実行中？ (\"--replace\" で試してみてください。)\n"
 
 #: main.cpp:182
 msgid "KDE window manager"
diff --git a/tde-i18n-ja/messages/kdebase/kwin_clients.po b/tde-i18n-ja/messages/kdebase/kwin_clients.po
index 6600124b4bf..2ae9ed73ea9 100644
--- a/tde-i18n-ja/messages/kdebase/kwin_clients.po
+++ b/tde-i18n-ja/messages/kdebase/kwin_clients.po
@@ -1,11 +1,11 @@
-# translation of kwin_clients.po to Japanese
+# translation of twin_clients.po to Japanese
 # Fumiaki Okushi <fokushi@yahoo.co.jp>, 2004.
 # Fumiaki Okushi <fumiaki@okushi.com>, 2005.
 # Shinichi Tsunoda <tsuno@ngy.1st.ne.jp>, 2005.
 # Yukiko Bando <ybando@k6.dion.ne.jp>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_clients\n"
+"Project-Id-Version: twin_clients\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2006-11-11 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
diff --git a/tde-i18n-ja/messages/kdebase/kwin_lib.po b/tde-i18n-ja/messages/kdebase/kwin_lib.po
index ef196f74aa0..5c49fa9e30f 100644
--- a/tde-i18n-ja/messages/kdebase/kwin_lib.po
+++ b/tde-i18n-ja/messages/kdebase/kwin_lib.po
@@ -1,10 +1,10 @@
-# translation of kwin_lib.po to Japanese
+# translation of twin_lib.po to Japanese
 # Shinichi Tsunoda <tsuno@ngy.1st.ne.jp>, 2005.
 # Yukiko Bando <ybando@k6.dion.ne.jp>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kwin_lib\n"
+"Project-Id-Version: twin_lib\n"
 "POT-Creation-Date: 2005-10-08 02:42+0200\n"
 "PO-Revision-Date: 2006-10-15 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
diff --git a/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po b/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
index a1d818cf28c..6eec9649e53 100644
--- a/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
+++ b/tde-i18n-ja/messages/kdebase/libkickermenu_kdeprint.po
@@ -1,11 +1,11 @@
-# translation of libkickermenu_kdeprint.po to Japanese
+# translation of libkickermenu_tdeprint.po to Japanese
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Noboru Sinohara <shinobo@leo.bekkoame.ne.jp>, 2002
 # Yukiko Bando <ybando@k6.dion.ne.jp>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libkickermenu_kdeprint\n"
+"Project-Id-Version: libkickermenu_tdeprint\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2006-05-03 18:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"