95 files changed, 104 insertions, 107 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e376de1..62c4e34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,8 @@ option( BUILD_ARK "Build ark" ${BUILD_ALL} )
 option( BUILD_CHARSELECTAPPLET "Build charselectapplet" ${BUILD_ALL} )
 option( BUILD_KCALC "Build kcalc" ${BUILD_ALL} )
 option( BUILD_KCHARSELECT "Build kcharselect" ${BUILD_ALL} )
-option( BUILD_KDELIRC "Build kdelirc" ${BUILD_ALL} )
-option( BUILD_KDESSH "Build kdessh" ${BUILD_ALL} )
+option( BUILD_TDELIRC "Build tdelirc" ${BUILD_ALL} )
+option( BUILD_TDESSH "Build tdessh" ${BUILD_ALL} )
 option( BUILD_KDF "Build kdf" ${BUILD_ALL} )
 option( BUILD_KEDIT "Build kedit" ${BUILD_ALL} )
 option( BUILD_KFLOPPY "Build kfloppy" ${BUILD_ALL} )
@@ -160,8 +160,8 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_CHARSELECTAPPLET charselectapplet )
 tde_conditional_add_subdirectory( BUILD_KCALC kcalc )
 tde_conditional_add_subdirectory( BUILD_KCHARSELECT kcharselect )
-tde_conditional_add_subdirectory( BUILD_KDELIRC kdelirc )
-tde_conditional_add_subdirectory( BUILD_KDESSH kdessh )
+tde_conditional_add_subdirectory( BUILD_TDELIRC tdelirc )
+tde_conditional_add_subdirectory( BUILD_TDESSH tdessh )
 tde_conditional_add_subdirectory( BUILD_KDF kdf )
 tde_conditional_add_subdirectory( BUILD_KEDIT kedit )
 tde_conditional_add_subdirectory( BUILD_KFLOPPY kfloppy )
diff --git a/README b/README
index 9e3708e..cc3dbeb 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ What it is
                the clipboard
 * charselectapplet: dito, but as a Kicker applet
 * kdepasswd: like 'passwd', a graphical password changer
-* kdessh: front end to ssh
+* tdessh: front end to ssh
 * kdf: like 'df', a graphical free disk space viewer
 * kedit: a simple text editor, without formatting like bold, italics etc
 * kfloppy: format a floppy disks with this app
diff --git a/doc/kdelirc/CMakeLists.txt b/doc/tdelirc/CMakeLists.txt
index dc6bb77..dc6bb77 100644
--- a/doc/kdelirc/CMakeLists.txt
+++ b/doc/tdelirc/CMakeLists.txt
diff --git a/doc/kdelirc/Makefile.am b/doc/tdelirc/Makefile.am
index 6812bd2..6812bd2 100644
--- a/doc/kdelirc/Makefile.am
+++ b/doc/tdelirc/Makefile.am
diff --git a/doc/kdelirc/irkick/CMakeLists.txt b/doc/tdelirc/irkick/CMakeLists.txt
index e48e649..e48e649 100644
--- a/doc/kdelirc/irkick/CMakeLists.txt
+++ b/doc/tdelirc/irkick/CMakeLists.txt
diff --git a/doc/kdelirc/irkick/Makefile.am b/doc/tdelirc/irkick/Makefile.am
index 085981d..085981d 100644
--- a/doc/kdelirc/irkick/Makefile.am
+++ b/doc/tdelirc/irkick/Makefile.am
diff --git a/doc/kdelirc/irkick/index.docbook b/doc/tdelirc/irkick/index.docbook
index 83c25f3..6ea5f3e 100644
--- a/doc/kdelirc/irkick/index.docbook
+++ b/doc/tdelirc/irkick/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY irkick "<application>IRKick</application>">
-  <!ENTITY kdelirc "<application>KDE LIRC</application>">
+  <!ENTITY tdelirc "<application>TDE LIRC</application>">
   <!ENTITY kappname "&irkick;">
   <!ENTITY package "tdeutils">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -11,7 +11,7 @@
 <book lang="&language;">
 <bookinfo>
 
-<title>&irkick;: The KDE LIRC Server Handbook</title>
+<title>&irkick;: The TDE LIRC Server Handbook</title>
 
 <authorgroup>
 <author>
@@ -34,14 +34,14 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<abstract><para>&kdelirc; is the infrastructure for the KDE's
+<abstract><para>&tdelirc; is the infrastructure for the TDE's
 Infrared Remote Control functionality; &irkick; is the server
 component of that infrastructure.</para></abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>irkick</keyword>
-<keyword>kdelirc</keyword>
+<keyword>tdelirc</keyword>
 <keyword>kcmlirc</keyword>
 <keyword>lirc</keyword>
 </keywordset>
@@ -66,8 +66,8 @@ TDE Control Center or directly from the menu of &irkick;.
 <title>Requirements</title>
 
 <para>
-For the KDELirc framework to be utilised you must have setup a LIRC
-on your KDE machine. If it is properly set up, the &irkick; icon in
+For the TDELirc framework to be utilised you must have setup a LIRC
+on your TDE machine. If it is properly set up, the &irkick; icon in
 the system tray will light up red. If not, it will be grey and crossed
 out.
 </para>
@@ -90,7 +90,7 @@ remote controls.
 </para>
 
 <para>
-Using the right-mouse-button menu, you can configure the KDE infrared remote
+Using the right-mouse-button menu, you can configure the TDE infrared remote
 control framework.
 </para>
 
@@ -99,7 +99,7 @@ control framework.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kdelirc;: The KDE LIRC Framework Copyright (c) 2004 Gav Wood
+<para>&tdelirc;: The TDE LIRC Framework Copyright (c) 2004 Gav Wood
 <email>gav@kde.org</email>.</para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/doc/kdelirc/kcmlirc/CMakeLists.txt b/doc/tdelirc/kcmlirc/CMakeLists.txt
index 7414552..7414552 100644
--- a/doc/kdelirc/kcmlirc/CMakeLists.txt
+++ b/doc/tdelirc/kcmlirc/CMakeLists.txt
diff --git a/doc/kdelirc/kcmlirc/Makefile.am b/doc/tdelirc/kcmlirc/Makefile.am
index 085981d..085981d 100644
--- a/doc/kdelirc/kcmlirc/Makefile.am
+++ b/doc/tdelirc/kcmlirc/Makefile.am
diff --git a/doc/kdelirc/kcmlirc/index.docbook b/doc/tdelirc/kcmlirc/index.docbook
index e3507c3..c60e125 100644
--- a/doc/kdelirc/kcmlirc/index.docbook
+++ b/doc/tdelirc/kcmlirc/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kcmlirc "<application>KDE LIRC Control Center Module</application>">
-  <!ENTITY kdelirc "<application>KDE LIRC</application>">
+  <!ENTITY kcmlirc "<application>TDE LIRC Control Center Module</application>">
+  <!ENTITY tdelirc "<application>TDE LIRC</application>">
   
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -10,7 +10,7 @@
 <book lang="&language;">
 <bookinfo>
 
-<title>KDE Infrared Remote Control Configuration</title>
+<title>TDE Infrared Remote Control Configuration</title>
 
 <authorgroup>
 <author>
@@ -33,13 +33,13 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<abstract><para>&kdelirc; configuration: The infrastructure for the KDE's
+<abstract><para>&tdelirc; configuration: The infrastructure for the TDE's
 Infrared Remote Control functionality.</para></abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>irkick</keyword>
-<keyword>kdelirc</keyword>
+<keyword>tdelirc</keyword>
 <keyword>kcmlirc</keyword>
 <keyword>lirc</keyword>
 </keywordset>
@@ -56,8 +56,8 @@ Infrared Remote Control functionality.</para></abstract>
 <title>Requirements</title>
 
 <para>
-For the KDELirc framework to be utilised you must have setup a LIRC
-on your KDE machine. If it is properly set up, the &kdelirc; icon in
+For the TDELirc framework to be utilised you must have setup a LIRC
+on your TDE machine. If it is properly set up, the &tdelirc; icon in
 the system tray (show icon here) will light up red. If not, it will
 be grey and crossed out.
 </para>
@@ -88,7 +88,7 @@ Each remote control can be in at most one mode at once (it may also be in no mod
 </para>
 
 <para>
-The list contains any remote controls detected on your system. Modes may be added and removed by selecting the desired remote control and using the buttons directly below the list Add, Remove. Modes may be renamed "inline" in the standard KDE fashion by first selecting the mode in the list box, and then clicking it again after a short pause. The Edit button allows mode names to be edited, and also allows you to define an icon that will show up in the system tray when that mode is entered.
+The list contains any remote controls detected on your system. Modes may be added and removed by selecting the desired remote control and using the buttons directly below the list Add, Remove. Modes may be renamed "inline" in the standard TDE fashion by first selecting the mode in the list box, and then clicking it again after a short pause. The Edit button allows mode names to be edited, and also allows you to define an icon that will show up in the system tray when that mode is entered.
 </para>
 
 </sect1>
@@ -97,7 +97,7 @@ The list contains any remote controls detected on your system. Modes may be adde
 <title>Action-Button Bindings</title>
 
 <para>
-An action/button binding ("action") is a connection between a button press and an effect. The effect may be to switch modes, to start a KDE program or to execute a function in a KDE program (using DCOP).
+An action/button binding ("action") is a connection between a button press and an effect. The effect may be to switch modes, to start a TDE program or to execute a function in a TDE program (using DCOP).
 </para>
 
 <para>
@@ -109,7 +109,7 @@ To add an action/button binding simply use the Add button. Removal may be perfor
 </para>
 
 <para>
-Actions may also be "automatically" populated. This handles the instance when you have a supported remote control and you wish to map its buttons to a supported application's functions. &kdelirc; can attempt to match buttons to functions for you; this behaviour may have to be tweaked, however.
+Actions may also be "automatically" populated. This handles the instance when you have a supported remote control and you wish to map its buttons to a supported application's functions. &tdelirc; can attempt to match buttons to functions for you; this behaviour may have to be tweaked, however.
 </para>
 
 </sect1>
@@ -118,7 +118,7 @@ Actions may also be "automatically" populated. This handles the instance when yo
 <title>Loaded Extensions</title>
 
 <para>
-There is another tab available named "Loaded Extensions". This details the applications and remote controls that &kdelirc; recognises. &kdelirc; can also use unsupported remote controls and applications, but the Auto-Populate function will not work as well (if at all).
+There is another tab available named "Loaded Extensions". This details the applications and remote controls that &tdelirc; recognises. &tdelirc; can also use unsupported remote controls and applications, but the Auto-Populate function will not work as well (if at all).
 </para>
 
 <para>
@@ -132,7 +132,7 @@ By clicking on an entry you can see information on it such as the author's detai
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kdelirc; KDE LIRC Framework Copyright (c) 2004 Gav Wood
+<para>&tdelirc; TDE LIRC Framework Copyright (c) 2004 Gav Wood
 <email>gav@kde.org</email>.</para>
 
 <para>Documentation Copyright (c) 2004 by Gav Wood
diff --git a/kdelirc/Makefile.am b/kdelirc/Makefile.am
deleted file mode 100644
index bb18f1c..0000000
--- a/kdelirc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SUBDIRS = icons kdelirc irkick kcmlirc profiles remotes
-
diff --git a/kdelirc/icons/Makefile.am b/kdelirc/icons/Makefile.am
deleted file mode 100644
index 8b53beb..0000000
--- a/kdelirc/icons/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirciconsdir = $(kde_datadir)/irkick/icons
-kdelircicons_ICON = AUTO
-
diff --git a/kdessh/Makefile.am b/kdessh/Makefile.am
deleted file mode 100644
index f716244..0000000
--- a/kdessh/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Makefile.am for kdessh
-AM_CPPFLAGS = -DQT_NO_CAST_ASCII
-
-INCLUDES= $(all_includes)
-
-## kdessh
-bin_PROGRAMS = 	kdessh
-kdessh_SOURCES = kdessh.cpp sshdlg.cpp
-kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kdessh_LDADD   = $(LIB_TDEUI) -ltdesu
-kdessh_METASOURCES =  AUTO
-noinst_HEADERS = sshdlg.h
-
-## Messages
-messages:
-	$(XGETTEXT) $(kdessh_SOURCES) -o $(podir)/kdessh.pot
-
diff --git a/kdessh/README b/kdessh/README
deleted file mode 100644
index b897486..0000000
--- a/kdessh/README
+++ /dev/null
@@ -1,3 +0,0 @@
-kdessh: A KDE front end to ssh.
-
-Please report bugs to Geert Jansen <jansen@kde.org>.
diff --git a/kdelirc/AUTHORS b/tdelirc/AUTHORS
index c6474a8..c6474a8 100644
--- a/kdelirc/AUTHORS
+++ b/tdelirc/AUTHORS
diff --git a/kdelirc/CMakeLists.txt b/tdelirc/CMakeLists.txt
index 156165f..251c9db 100644
--- a/kdelirc/CMakeLists.txt
+++ b/tdelirc/CMakeLists.txt
@@ -12,6 +12,6 @@
 add_subdirectory( icons )
 add_subdirectory( irkick )
 add_subdirectory( kcmlirc )
-add_subdirectory( kdelirc )
+add_subdirectory( tdelirc )
 add_subdirectory( profiles )
 add_subdirectory( remotes )
diff --git a/kdelirc/COPYING b/tdelirc/COPYING
index c13faf0..c13faf0 100644
--- a/kdelirc/COPYING
+++ b/tdelirc/COPYING
diff --git a/tdelirc/Makefile.am b/tdelirc/Makefile.am
new file mode 100644
index 0000000..1b42dee
--- /dev/null
+++ b/tdelirc/Makefile.am
@@ -0,0 +1,3 @@
+
+SUBDIRS = icons tdelirc irkick kcmlirc profiles remotes
+
diff --git a/kdelirc/README b/tdelirc/README
index 31af5d0..8ae6875 100644
--- a/kdelirc/README
+++ b/tdelirc/README
@@ -1,7 +1,7 @@
-kdelirc
+tdelirc
 -------
 
-KDELIRC is a KDE frontend for the Linux Infrared Remote Control system. It has
+TDELIRC is a TDE frontend for the Linux Infrared Remote Control system. It has
 two aims:
 
 1. Provide a control center module for configuration of:
@@ -9,7 +9,7 @@ two aims:
 	b) Actual remote controls installed (i.e. lirc configuration).
 
 2. Provide a system-tray applet to act as a proxy between the LIRC system and
-	KDE (applications), in order to launch DCOP requests (and potentially
+	TDE (applications), in order to launch DCOP requests (and potentially
 	other IPC signals) to applications (and potentially collect/display
 	results).
 
@@ -19,7 +19,7 @@ Nothing but the normal ./configure && make && su -c "make install".
 
 SETUP
 
-For the KDELirc system to work properly, you *must* have lircd configured and
+For the TDELirc system to work properly, you *must* have lircd configured and
 running. If you have already had a Lirc program running, then you most likely
 have Lirc set up properly. If not, be sure that you have a correct kernel module
 loaded for your IR receiver (1) and that the lircd program is running (2).
diff --git a/kdelirc/README.profile-creation b/tdelirc/README.profile-creation
index 95d9e78..80ec429 100644
--- a/kdelirc/README.profile-creation
+++ b/tdelirc/README.profile-creation
@@ -6,12 +6,12 @@ by Gav Wood, 2003.
 Introduction
 ------------
 
-All DCOP-using applications under KDE have basic lirc support, since KDELirc has
+All DCOP-using applications under KDE have basic lirc support, since TDELirc has
 the ability to interface any button to any DCOP call. However, to give your
-application the real professional touch when using it with KDELirc, I recommend
+application the real professional touch when using it with TDELirc, I recommend
 you create a profile for it.
 
-A profile tells KDELirc (and the user!) what the various DCOP calls do.
+A profile tells TDELirc (and the user!) what the various DCOP calls do.
 Essentially this is a kind of documentation for the DCOP calls. You don't have
 to include all DCOP calls - just the ones that you feel would benefit end-users
 the most (usually "interface adjusting" calls rather the "information gathering"
@@ -38,7 +38,7 @@ necessary).
 
 Having coded the necessary DCOP functionality into your application, the only
 other thing to do is describe how it works to the user. This is done by means of
-a .profile.xml document, examples of which may be found in the kdelirc/profiles
+a .profile.xml document, examples of which may be found in the tdelirc/profiles
 directory. A quick guide is given here:
 
 a) First create top level "profile" tags with the DCOP application id and KDE
@@ -52,7 +52,7 @@ service name (found in the .desktop file) as attributes of them:
 b) Inside populate with name and author information. If your application is not a
 KUniqueApplication, you **must** declare this with an "instances" tag, giving the
 attribute "unique" a value of "0" (it defaults to "1", a KUniqueApplication). You
-may optionally describe the default behavior KDELirc should take should there be
+may optionally describe the default behavior TDELirc should take should there be
 more than one instance of the application, with the attribute "ifmulti" which may
 take one of "dontsend" (do nothing if >1 instance), "sendtoone" (send call to one
 arbitrarily chosen instance) and "sendtoall" (send to all instances). The default
diff --git a/kdelirc/README.remote-creation b/tdelirc/README.remote-creation
index 5cf5213..a9342c5 100644
--- a/kdelirc/README.remote-creation
+++ b/tdelirc/README.remote-creation
@@ -1,4 +1,4 @@
-How to give your LIRC remote control KDELIRC functionality
+How to give your LIRC remote control TDELIRC functionality
 ==========================================================
 
 by Gav Wood, 2003.
@@ -6,8 +6,8 @@ by Gav Wood, 2003.
 Introduction
 ------------
 
-All LIRC-understandable remote controls automatically function in KDELirc.
-However, to get the advanced (really cool) KDELirc stuff you'll need to create a
+All LIRC-understandable remote controls automatically function in TDELirc.
+However, to get the advanced (really cool) TDELirc stuff you'll need to create a
 remote.xml file for your remote control. The files are simple and easy to create
 so don't be put off.
 
@@ -17,7 +17,7 @@ since LIRC only allows non-spaces, non-symbolic charecters in the remote control
 definition files.
 
 When you're finished your remote.xml, you might want to send it to me
-(gav at kde dot org) for inclusion in the distribution of KDELirc. It may soon
+(gav at kde dot org) for inclusion in the distribution of TDELirc. It may soon
 be possible to distribute the remote.xml files along with the lircd.conf files.
 
 Method
@@ -52,8 +52,8 @@ b) With the hard work out of the way, just start going though each button on the
 remote control. For each button, make sure the "id" attribute is the same as in
 the lircd.conf file.
    For each (common) button, you might also want to specify the class, which will
-help KDELirc match it to any application's action. For a list of all button
-classes, look in the remote.dtd file which comes with KDELirc. If the class type
+help TDELirc match it to any application's action. For a list of all button
+classes, look in the remote.dtd file which comes with TDELirc. If the class type
 is one which encompasses many buttons, for example "number", then you should also
 specify which number it is in the parameter attribute. Currently, this only
 actually applies to "number" - all other classes are simple and do not require a
@@ -120,7 +120,7 @@ to the far less cluttered and simpler:
 		<button id="num0" class="number" parameter="0"/>
 
 That's it - just save it as <id>.remote.xml, where <id> is the ID of the remote
-control (*not* its name but the LIRC id!) and copy it to your KDE remotes data
+control (*not* its name but the LIRC id!) and copy it to your TDE remotes data
 directory (~/.trinity/share/apps/remotes).
 
    You'll probably need to restart control center before the remote definition
diff --git a/kdelirc/TODO b/tdelirc/TODO
index a7e1044..a7e1044 100644
--- a/kdelirc/TODO
+++ b/tdelirc/TODO
diff --git a/kdelirc/icons/CMakeLists.txt b/tdelirc/icons/CMakeLists.txt
index 567e0a6..567e0a6 100644
--- a/kdelirc/icons/CMakeLists.txt
+++ b/tdelirc/icons/CMakeLists.txt
diff --git a/tdelirc/icons/Makefile.am b/tdelirc/icons/Makefile.am
new file mode 100644
index 0000000..d2a3efc
--- /dev/null
+++ b/tdelirc/icons/Makefile.am
@@ -0,0 +1,3 @@
+tdelirciconsdir = $(kde_datadir)/irkick/icons
+tdelircicons_ICON = AUTO
+
diff --git a/kdelirc/irkick/CMakeLists.txt b/tdelirc/irkick/CMakeLists.txt
index ca05d81..d8d14d9 100644
--- a/kdelirc/irkick/CMakeLists.txt
+++ b/tdelirc/irkick/CMakeLists.txt
@@ -15,14 +15,14 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kdelirc/kdelirc
+  ${CMAKE_SOURCE_DIR}/tdelirc/tdelirc
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${CMAKE_BINARY_DIR}/kdelirc/kdelirc
+  ${CMAKE_BINARY_DIR}/tdelirc/tdelirc
 )
 
 
@@ -31,7 +31,7 @@ link_directories(
 tde_add_library( irkick_common STATIC_PIC AUTOMOC
   SOURCES irkick.cpp irkick.skel
     irkick.stub klircclient.cpp
-  LINK tdeui-shared kdelirc-static
+  LINK tdeui-shared tdelirc-static
 )
 
 
diff --git a/kdelirc/irkick/Makefile.am b/tdelirc/irkick/Makefile.am
index b7d03f3..0e753f7 100644
--- a/kdelirc/irkick/Makefile.am
+++ b/tdelirc/irkick/Makefile.am
@@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = irkick.la
 
 CLEANFILES = dummy.cpp
 
-libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) ../kdelirc/libkdelirc.la
+libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) ../tdelirc/libtdelirc.la
 libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub klircclient.cpp
 
 libirkick_common_la_LDFLAGS = $(all_libraries)
@@ -32,11 +32,11 @@ dummy.cpp:
 #lib_LTLIBRARIES = libkded_irkick.la
 #libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub klircclient.cpp
 #libkded_irkick_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#libkded_irkick_la_LIBADD = $(LIB_TDECORE) ../kdelirc/libkdelirc.la
+#libkded_irkick_la_LIBADD = $(LIB_TDECORE) ../tdelirc/libtdelirc.la
 
 noinst_HEADERS = irkick.h klircclient.h irkick_stub.h
 
-INCLUDES = -I$(srcdir)/../kdelirc $(all_includes)
+INCLUDES = -I$(srcdir)/../tdelirc $(all_includes)
 
 KDE_ICON = AUTO
 METASOURCES = AUTO
diff --git a/kdelirc/irkick/icons/CMakeLists.txt b/tdelirc/irkick/icons/CMakeLists.txt
index ffd9b18..ffd9b18 100644
--- a/kdelirc/irkick/icons/CMakeLists.txt
+++ b/tdelirc/irkick/icons/CMakeLists.txt
diff --git a/kdelirc/irkick/icons/Makefile.am b/tdelirc/irkick/icons/Makefile.am
index 307658e..307658e 100644
--- a/kdelirc/irkick/icons/Makefile.am
+++ b/tdelirc/irkick/icons/Makefile.am
diff --git a/kdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp
index 2d042f0..2d042f0 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/tdelirc/irkick/irkick.cpp
diff --git a/kdelirc/irkick/irkick.desktop b/tdelirc/irkick/irkick.desktop
index 4f5cbb9..4f5cbb9 100644
--- a/kdelirc/irkick/irkick.desktop
+++ b/tdelirc/irkick/irkick.desktop
diff --git a/kdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h
index 786e100..786e100 100644
--- a/kdelirc/irkick/irkick.h
+++ b/tdelirc/irkick/irkick.h
diff --git a/kdelirc/irkick/irkick.project b/tdelirc/irkick/irkick.project
index b486441..b486441 100644
--- a/kdelirc/irkick/irkick.project
+++ b/tdelirc/irkick/irkick.project
diff --git a/kdelirc/irkick/kdedmodule_stub.h b/tdelirc/irkick/kdedmodule_stub.h
index 57542d2..57542d2 100644
--- a/kdelirc/irkick/kdedmodule_stub.h
+++ b/tdelirc/irkick/kdedmodule_stub.h
diff --git a/kdelirc/irkick/klircclient.cpp b/tdelirc/irkick/klircclient.cpp
index b7051fc..b7051fc 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/tdelirc/irkick/klircclient.cpp
diff --git a/kdelirc/irkick/klircclient.h b/tdelirc/irkick/klircclient.h
index 3af4637..3af4637 100644
--- a/kdelirc/irkick/klircclient.h
+++ b/tdelirc/irkick/klircclient.h
diff --git a/kdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp
index aa9d697..5d5a791 100644
--- a/kdelirc/irkick/main.cpp
+++ b/tdelirc/irkick/main.cpp
@@ -29,7 +29,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	TDECmdLineArgs::init( argc, argv, aboutData );
 	KUniqueApplication::addCmdLineOptions();
 	KUniqueApplication app;
-	TDEGlobal::locale()->insertCatalogue( "kdelirc" );
+	TDEGlobal::locale()->insertCatalogue( "tdelirc" );
 	app.disableSessionManagement();
 	IRKick *theIRKick = new IRKick("IRKick");
 
diff --git a/kdelirc/kcmlirc/CMakeLists.txt b/tdelirc/kcmlirc/CMakeLists.txt
index e5c6e2b..7761e97 100644
--- a/kdelirc/kcmlirc/CMakeLists.txt
+++ b/tdelirc/kcmlirc/CMakeLists.txt
@@ -12,17 +12,17 @@
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kdelirc/irkick
+  ${CMAKE_BINARY_DIR}/tdelirc/irkick
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kdelirc/irkick
-  ${CMAKE_SOURCE_DIR}/kdelirc/kdelirc
+  ${CMAKE_SOURCE_DIR}/tdelirc/irkick
+  ${CMAKE_SOURCE_DIR}/tdelirc/tdelirc
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${CMAKE_BINARY_DIR}/kdelirc/kdelirc
+  ${CMAKE_BINARY_DIR}/tdelirc/tdelirc
 )
 
 
@@ -34,7 +34,7 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC
     addaction.cpp kcmlirc.skel editactionbase.ui
     editmodebase.ui editmode.cpp editaction.cpp
     modeslist.cpp
-  LINK kdelirc-static tdeui-shared tdeio-shared
+  LINK tdelirc-static tdeui-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kdelirc/kcmlirc/Makefile.am b/tdelirc/kcmlirc/Makefile.am
index 3707367..53eb7af 100644
--- a/kdelirc/kcmlirc/Makefile.am
+++ b/tdelirc/kcmlirc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES    = -I../irkick -I$(srcdir)/../irkick -I$(srcdir)/../kdelirc $(all_includes)
+INCLUDES    = -I../irkick -I$(srcdir)/../irkick -I$(srcdir)/../tdelirc $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kcmlirc.la
 
 noinst_HEADERS = kcmlirc.h addaction.h addactionbase.h
 kcm_kcmlirc_la_SOURCES = selectprofile.ui newmode.ui kcmlircbase.ui kcmlirc.cpp addactionbase.ui addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp
-kcm_kcmlirc_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEFILE) ../kdelirc/libkdelirc.la
+kcm_kcmlirc_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEFILE) ../tdelirc/libtdelirc.la
 kcm_kcmlirc_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
 
 xdg_apps_DATA = kcmlirc.desktop
diff --git a/kdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp
index 8a87775..8a87775 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/tdelirc/kcmlirc/addaction.cpp
diff --git a/kdelirc/kcmlirc/addaction.h b/tdelirc/kcmlirc/addaction.h
index 3a3f22f..3a3f22f 100644
--- a/kdelirc/kcmlirc/addaction.h
+++ b/tdelirc/kcmlirc/addaction.h
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/tdelirc/kcmlirc/addactionbase.ui
index dfb6f12..dfb6f12 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/tdelirc/kcmlirc/addactionbase.ui
diff --git a/kdelirc/kcmlirc/editaction.cpp b/tdelirc/kcmlirc/editaction.cpp
index 8d8a0cb..8d8a0cb 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/tdelirc/kcmlirc/editaction.cpp
diff --git a/kdelirc/kcmlirc/editaction.h b/tdelirc/kcmlirc/editaction.h
index 8b19b6a..8b19b6a 100644
--- a/kdelirc/kcmlirc/editaction.h
+++ b/tdelirc/kcmlirc/editaction.h
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/tdelirc/kcmlirc/editactionbase.ui
index 7e1a006..7e1a006 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/tdelirc/kcmlirc/editactionbase.ui
diff --git a/kdelirc/kcmlirc/editmode.cpp b/tdelirc/kcmlirc/editmode.cpp
index a197bb7..a197bb7 100644
--- a/kdelirc/kcmlirc/editmode.cpp
+++ b/tdelirc/kcmlirc/editmode.cpp
diff --git a/kdelirc/kcmlirc/editmode.h b/tdelirc/kcmlirc/editmode.h
index 5de0836..5de0836 100644
--- a/kdelirc/kcmlirc/editmode.h
+++ b/tdelirc/kcmlirc/editmode.h
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/tdelirc/kcmlirc/editmodebase.ui
index b59533b..b59533b 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/tdelirc/kcmlirc/editmodebase.ui
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp
index bf18895..bf18895 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/tdelirc/kcmlirc/kcmlirc.cpp
diff --git a/kdelirc/kcmlirc/kcmlirc.desktop b/tdelirc/kcmlirc/kcmlirc.desktop
index 09033c1..09033c1 100644
--- a/kdelirc/kcmlirc/kcmlirc.desktop
+++ b/tdelirc/kcmlirc/kcmlirc.desktop
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/tdelirc/kcmlirc/kcmlirc.h
index 207c995..207c995 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/tdelirc/kcmlirc/kcmlirc.h
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui
index b5b21bf..b5b21bf 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/tdelirc/kcmlirc/kcmlircbase.ui
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui.h b/tdelirc/kcmlirc/kcmlircbase.ui.h
index dcf2ec3..dcf2ec3 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui.h
+++ b/tdelirc/kcmlirc/kcmlircbase.ui.h
diff --git a/kdelirc/kcmlirc/modeslist.cpp b/tdelirc/kcmlirc/modeslist.cpp
index 1665e64..1665e64 100644
--- a/kdelirc/kcmlirc/modeslist.cpp
+++ b/tdelirc/kcmlirc/modeslist.cpp
diff --git a/kdelirc/kcmlirc/modeslist.h b/tdelirc/kcmlirc/modeslist.h
index d6a4b25..d6a4b25 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/tdelirc/kcmlirc/modeslist.h
diff --git a/kdelirc/kcmlirc/newmode.ui b/tdelirc/kcmlirc/newmode.ui
index 811b493..811b493 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/tdelirc/kcmlirc/newmode.ui
diff --git a/kdelirc/kcmlirc/newmode.ui.h b/tdelirc/kcmlirc/newmode.ui.h
index 29c4166..29c4166 100644
--- a/kdelirc/kcmlirc/newmode.ui.h
+++ b/tdelirc/kcmlirc/newmode.ui.h
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/tdelirc/kcmlirc/selectprofile.ui
index 911deb4..911deb4 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/tdelirc/kcmlirc/selectprofile.ui
diff --git a/kdelirc/profiles/CMakeLists.txt b/tdelirc/profiles/CMakeLists.txt
index 7fedebd..7fedebd 100644
--- a/kdelirc/profiles/CMakeLists.txt
+++ b/tdelirc/profiles/CMakeLists.txt
diff --git a/kdelirc/profiles/Makefile.am b/tdelirc/profiles/Makefile.am
index 9561d73..9561d73 100644
--- a/kdelirc/profiles/Makefile.am
+++ b/tdelirc/profiles/Makefile.am
diff --git a/kdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml
index 0fdfdba..0fdfdba 100644
--- a/kdelirc/profiles/konqueror.profile.xml
+++ b/tdelirc/profiles/konqueror.profile.xml
diff --git a/kdelirc/profiles/noatun.profile.xml b/tdelirc/profiles/noatun.profile.xml
index a9b204b..a9b204b 100644
--- a/kdelirc/profiles/noatun.profile.xml
+++ b/tdelirc/profiles/noatun.profile.xml
diff --git a/kdelirc/profiles/profile.dtd b/tdelirc/profiles/profile.dtd
index 070fd14..070fd14 100644
--- a/kdelirc/profiles/profile.dtd
+++ b/tdelirc/profiles/profile.dtd
diff --git a/kdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml
index 57eca31..57eca31 100644
--- a/kdelirc/profiles/tdelauncher.profile.xml
+++ b/tdelirc/profiles/tdelauncher.profile.xml
diff --git a/kdelirc/remotes/CMakeLists.txt b/tdelirc/remotes/CMakeLists.txt
index d681539..d681539 100644
--- a/kdelirc/remotes/CMakeLists.txt
+++ b/tdelirc/remotes/CMakeLists.txt
diff --git a/kdelirc/remotes/Makefile.am b/tdelirc/remotes/Makefile.am
index b040270..b040270 100644
--- a/kdelirc/remotes/Makefile.am
+++ b/tdelirc/remotes/Makefile.am
diff --git a/kdelirc/remotes/RM-0010.remote.xml b/tdelirc/remotes/RM-0010.remote.xml
index 64146e5..64146e5 100644
--- a/kdelirc/remotes/RM-0010.remote.xml
+++ b/tdelirc/remotes/RM-0010.remote.xml
diff --git a/kdelirc/remotes/cimr100.remote.xml b/tdelirc/remotes/cimr100.remote.xml
index 5dfc36d..5dfc36d 100644
--- a/kdelirc/remotes/cimr100.remote.xml
+++ b/tdelirc/remotes/cimr100.remote.xml
diff --git a/kdelirc/remotes/hauppauge.remote.xml b/tdelirc/remotes/hauppauge.remote.xml
index 4d2a402..4d2a402 100644
--- a/kdelirc/remotes/hauppauge.remote.xml
+++ b/tdelirc/remotes/hauppauge.remote.xml
diff --git a/kdelirc/remotes/remote.dtd b/tdelirc/remotes/remote.dtd
index a09b4b6..a09b4b6 100644
--- a/kdelirc/remotes/remote.dtd
+++ b/tdelirc/remotes/remote.dtd
diff --git a/kdelirc/remotes/sherwood.remote.xml b/tdelirc/remotes/sherwood.remote.xml
index db628ba..db628ba 100644
--- a/kdelirc/remotes/sherwood.remote.xml
+++ b/tdelirc/remotes/sherwood.remote.xml
diff --git a/kdelirc/remotes/sonytv.remote.xml b/tdelirc/remotes/sonytv.remote.xml
index 4e5ee97..4e5ee97 100644
--- a/kdelirc/remotes/sonytv.remote.xml
+++ b/tdelirc/remotes/sonytv.remote.xml
diff --git a/kdelirc/kdelirc/CMakeLists.txt b/tdelirc/tdelirc/CMakeLists.txt
index cc6d737..2893472 100644
--- a/kdelirc/kdelirc/CMakeLists.txt
+++ b/tdelirc/tdelirc/CMakeLists.txt
@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### kdelirc (static) ##########################
+##### tdelirc (static) ##########################
 
-tde_add_library( kdelirc STATIC_PIC
+tde_add_library( tdelirc STATIC_PIC
   SOURCES iraction.cpp arguments.cpp
     iractions.cpp prototype.cpp modes.cpp
     mode.cpp profileserver.cpp remoteserver.cpp
diff --git a/kdelirc/kdelirc/Makefile.am b/tdelirc/tdelirc/Makefile.am
index 764a620..e488f85 100644
--- a/kdelirc/kdelirc/Makefile.am
+++ b/tdelirc/tdelirc/Makefile.am
@@ -1,13 +1,13 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
-noinst_LTLIBRARIES = libkdelirc.la
+noinst_LTLIBRARIES = libtdelirc.la
 
 noinst_HEADERS = iraction.h arguments.h iractions.h prototype.h modes.h mode.h profileserver.h remoteserver.h
 
-libkdelirc_la_SOURCES = iraction.cpp arguments.cpp iractions.cpp prototype.cpp modes.cpp mode.cpp profileserver.cpp remoteserver.cpp
-libkdelirc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET)
+libtdelirc_la_SOURCES = iraction.cpp arguments.cpp iractions.cpp prototype.cpp modes.cpp mode.cpp profileserver.cpp remoteserver.cpp
+libtdelirc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET)
 
 ####### tdevelop will overwrite this part!!! (end)############
-# These paths are KDE specific. Use them:
+# These paths are TDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
 # kde_icondir         Where your icon should go to - better use KDE_ICON.
 # kde_sounddir        Where your sounds should go to.
@@ -25,16 +25,16 @@ libkdelirc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET)
 # kde_bindir          Where executables should go to. Use bin_PROGRAMS or bin_SCRIPTS.
 # kde_libdir          Where shared libraries should go to. Use lib_LTLIBRARIES.
 # kde_moduledir       Where modules (e.g. parts) should go to. Use kde_module_LTLIBRARIES.
-# kde_styledir        Where Qt/KDE widget styles should go to (new in KDE 3).
+# kde_styledir        Where Qt/TDE widget styles should go to (new in KDE 3).
 # kde_designerdir     Where Qt Designer plugins should go to (new in KDE 3).
 
-# set the include path for X, qt and KDE
+# set the include path for X, qt and TDE
 INCLUDES = $(all_includes)
 
 METASOURCES = AUTO
 
 # the library search path. 
-libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libtdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE�s XML GUI builing
@@ -42,4 +42,4 @@ libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDE
 #rc_DATA = irkickui.rc
 
 messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kdelirc.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdelirc.pot
diff --git a/kdelirc/kdelirc/arguments.cpp b/tdelirc/tdelirc/arguments.cpp
index fc678ce..fc678ce 100644
--- a/kdelirc/kdelirc/arguments.cpp
+++ b/tdelirc/tdelirc/arguments.cpp
diff --git a/kdelirc/kdelirc/arguments.h b/tdelirc/tdelirc/arguments.h
index dae1f5c..dae1f5c 100644
--- a/kdelirc/kdelirc/arguments.h
+++ b/tdelirc/tdelirc/arguments.h
diff --git a/kdelirc/kdelirc/iraction.cpp b/tdelirc/tdelirc/iraction.cpp
index 46b581f..46b581f 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/tdelirc/tdelirc/iraction.cpp
diff --git a/kdelirc/kdelirc/iraction.h b/tdelirc/tdelirc/iraction.h
index 14d0354..14d0354 100644
--- a/kdelirc/kdelirc/iraction.h
+++ b/tdelirc/tdelirc/iraction.h
diff --git a/kdelirc/kdelirc/iractions.cpp b/tdelirc/tdelirc/iractions.cpp
index 85d144e..85d144e 100644
--- a/kdelirc/kdelirc/iractions.cpp
+++ b/tdelirc/tdelirc/iractions.cpp
diff --git a/kdelirc/kdelirc/iractions.h b/tdelirc/tdelirc/iractions.h
index 4c44c46..4c44c46 100644
--- a/kdelirc/kdelirc/iractions.h
+++ b/tdelirc/tdelirc/iractions.h
diff --git a/kdelirc/kdelirc/mode.cpp b/tdelirc/tdelirc/mode.cpp
index 9402573..9402573 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/tdelirc/tdelirc/mode.cpp
diff --git a/kdelirc/kdelirc/mode.h b/tdelirc/tdelirc/mode.h
index 55b7b0a..55b7b0a 100644
--- a/kdelirc/kdelirc/mode.h
+++ b/tdelirc/tdelirc/mode.h
diff --git a/kdelirc/kdelirc/modes.cpp b/tdelirc/tdelirc/modes.cpp
index 8eedce0..8eedce0 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/tdelirc/tdelirc/modes.cpp
diff --git a/kdelirc/kdelirc/modes.h b/tdelirc/tdelirc/modes.h
index d0de17a..d0de17a 100644
--- a/kdelirc/kdelirc/modes.h
+++ b/tdelirc/tdelirc/modes.h
diff --git a/kdelirc/kdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp
index ba39442..ba39442 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/tdelirc/tdelirc/profileserver.cpp
diff --git a/kdelirc/kdelirc/profileserver.h b/tdelirc/tdelirc/profileserver.h
index 0d9bc59..0d9bc59 100644
--- a/kdelirc/kdelirc/profileserver.h
+++ b/tdelirc/tdelirc/profileserver.h
diff --git a/kdelirc/kdelirc/prototype.cpp b/tdelirc/tdelirc/prototype.cpp
index 8e2eedf..8e2eedf 100644
--- a/kdelirc/kdelirc/prototype.cpp
+++ b/tdelirc/tdelirc/prototype.cpp
diff --git a/kdelirc/kdelirc/prototype.h b/tdelirc/tdelirc/prototype.h
index fa101b7..fa101b7 100644
--- a/kdelirc/kdelirc/prototype.h
+++ b/tdelirc/tdelirc/prototype.h
diff --git a/kdelirc/kdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp
index dafa67d..dafa67d 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/tdelirc/tdelirc/remoteserver.cpp
diff --git a/kdelirc/kdelirc/remoteserver.h b/tdelirc/tdelirc/remoteserver.h
index 80891ba..80891ba 100644
--- a/kdelirc/kdelirc/remoteserver.h
+++ b/tdelirc/tdelirc/remoteserver.h
diff --git a/kdessh/CMakeLists.txt b/tdessh/CMakeLists.txt
index 8abf536..9681682 100644
--- a/kdessh/CMakeLists.txt
+++ b/tdessh/CMakeLists.txt
@@ -26,10 +26,10 @@ add_definitions(
 )
 
 
-##### kdessh (executable) #######################
+##### tdessh (executable) #######################
 
-tde_add_executable( kdessh AUTOMOC
-  SOURCES kdessh.cpp sshdlg.cpp
+tde_add_executable( tdessh AUTOMOC
+  SOURCES tdessh.cpp sshdlg.cpp
   LINK tdeui-shared tdesu-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdessh/LICENSE.readme b/tdessh/LICENSE.readme
index eb08ce6..3ce8813 100644
--- a/kdessh/LICENSE.readme
+++ b/tdessh/LICENSE.readme
@@ -1,4 +1,4 @@
-kdessh - a KDE front end to ssh
+tdessh - a TDE front end to ssh
 
 Copyright (c) 1999,2000 by Geert Jansen <jansen@kde.org>
 
diff --git a/tdessh/Makefile.am b/tdessh/Makefile.am
new file mode 100644
index 0000000..84f1b5b
--- /dev/null
+++ b/tdessh/Makefile.am
@@ -0,0 +1,17 @@
+## Makefile.am for tdessh
+AM_CPPFLAGS = -DQT_NO_CAST_ASCII
+
+INCLUDES= $(all_includes)
+
+## tdessh
+bin_PROGRAMS = 	tdessh
+tdessh_SOURCES = tdessh.cpp sshdlg.cpp
+tdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdessh_LDADD   = $(LIB_TDEUI) -ltdesu
+tdessh_METASOURCES =  AUTO
+noinst_HEADERS = sshdlg.h
+
+## Messages
+messages:
+	$(XGETTEXT) $(tdessh_SOURCES) -o $(podir)/tdessh.pot
+
diff --git a/kdessh/sshdlg.cpp b/tdessh/sshdlg.cpp
index c7ca281..a43c9d0 100644
--- a/kdessh/sshdlg.cpp
+++ b/tdessh/sshdlg.cpp
@@ -13,7 +13,7 @@
 #include "sshdlg.h"
 
 
-KDEsshDialog::KDEsshDialog(TQCString host, TQCString user, TQCString stub,
+TDEsshDialog::TDEsshDialog(TQCString host, TQCString user, TQCString stub,
 	TQString prompt, bool enableKeep)
     : KPasswordDialog(Password, enableKeep, 0)
 {
@@ -36,12 +36,12 @@ KDEsshDialog::KDEsshDialog(TQCString host, TQCString user, TQCString stub,
 }
 
 
-KDEsshDialog::~KDEsshDialog()
+TDEsshDialog::~TDEsshDialog()
 {
 }
 
 
-bool KDEsshDialog::checkPassword(const char *password)
+bool TDEsshDialog::checkPassword(const char *password)
 {
     SshProcess proc(m_Host, m_User);
     proc.setStub(m_Stub);
diff --git a/kdessh/sshdlg.h b/tdessh/sshdlg.h
index 45175d7..79415ad 100644
--- a/kdessh/sshdlg.h
+++ b/tdessh/sshdlg.h
@@ -11,16 +11,16 @@
 
 #include <kpassdlg.h>
 
-class KDEsshDialog
+class TDEsshDialog
     : public KPasswordDialog
 {
     Q_OBJECT
   
 
 public:
-    KDEsshDialog(TQCString host, TQCString user, TQCString stub, 
+    TDEsshDialog(TQCString host, TQCString user, TQCString stub, 
 	    TQString prompt, bool enableKeep);
-    ~KDEsshDialog();
+    ~TDEsshDialog();
 
 protected:
     bool checkPassword(const char *password);
diff --git a/kdessh/kdessh.cpp b/tdessh/tdessh.cpp
index 5d64290..593a0fd 100644
--- a/kdessh/kdessh.cpp
+++ b/tdessh/tdessh.cpp
@@ -48,7 +48,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    TDEAboutData aboutData("kdessh", I18N_NOOP("TDE ssh"),
+    TDEAboutData aboutData("tdessh", I18N_NOOP("TDE ssh"),
 	    VERSION, I18N_NOOP("Runs a program on a remote host"),
 	    TDEAboutData::License_Artistic,
 	    "Copyright (c) 2000 Geert Jansen");
@@ -169,11 +169,11 @@ int main(int argc, char *argv[])
     TQCString password;
     if (needpw != 0)
     {
-	KDEsshDialog *dlg = new KDEsshDialog(host, user, stub,
+	TDEsshDialog *dlg = new TDEsshDialog(host, user, stub,
 		proc.prompt(), keep && !terminal);
 	dlg->addLine(i18n("Command"), command);
 	int res = dlg->exec();
-	if (res == KDEsshDialog::Rejected)
+	if (res == TDEsshDialog::Rejected)
 	    exit(0);
 	keep = dlg->keep();
 	password = dlg->password();