Branding cleanup on Debian and Ubuntu

113 files changed, 881 insertions, 881 deletions

diff --git a/debian/lenny/tdebase/debian/80ubuntu-xmodmap b/debian/lenny/tdebase/debian/80ubuntu-xmodmap
index 7774dd9b8..fa60a4107 100644
--- a/debian/lenny/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/lenny/tdebase/debian/80ubuntu-xmodmap
@@ -1,4 +1,4 @@
-# Set the Ubuntu laptop keycode -> xkeysyms mapping (used by KDE)
+# Set the Ubuntu laptop keycode -> xkeysyms mapping (used by TDE)
 #
 # This file is sourced by Xsession(5), not executed.
 # The "|| true" is to ensure that the Xsession script does not terminate on error
diff --git a/debian/lenny/tdebase/debian/cdbs/versions.pl b/debian/lenny/tdebase/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/lenny/tdebase/debian/cdbs/versions.pl
+++ b/debian/lenny/tdebase/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index a4a7cc999..1526c8ba8 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -17,14 +17,14 @@ Breaks: kdebase-trinity (<< 4:14.0.0~)
 Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-tdeio-plugins-trinity (>= ${Source-Version}), tdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), xcalib
 Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
-Description: base components from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: base components from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This metapackage includes the nucleus of KDE, namely the minimal package
- set necessary to run KDE as a desktop environment. This includes the
+ This metapackage includes the nucleus of TDE, namely the minimal package
+ set necessary to run TDE as a desktop environment. This includes the
  window manager, taskbar, control center, a text editor, file manager,
  web browser, X terminal emulator, and many other programs and components.
 
@@ -45,12 +45,12 @@ Architecture: any
 Replaces: kappfinder-trinity (<< 4:14.0.0~)
 Breaks: kappfinder-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: non-KDE application finder for KDE
+Description: non-TDE application finder for TDE
  kappfinder searches your workstation for many common applications and
  creates menu entries for them.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kate-trinity
 Section: editors
@@ -60,9 +60,9 @@ Breaks: kate-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Recommends: kregexpeditor-trinity
 Suggests: aspell | ispell | hspell, kate-plugins-trinity, khelpcenter-trinity, konsole-trinity
-Description: advanced text editor for KDE
+Description: advanced text editor for TDE
  Kate is a multi document editor, based on a rewritten version of the kwrite
- editing widget of KDE.
+ editing widget of TDE.
  .
  It is a multi-view editor that lets you view several instances of the same
  document with all instances being synced, or view more files at the same
@@ -80,21 +80,21 @@ Description: advanced text editor for KDE
   * Filter command
   * Global grep dialog
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kcontrol-trinity
 Section: tde
 Architecture: any
 Replaces: kcontrol-trinity (<< 4:14.0.0~)
 Breaks: kcontrol-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), tdebase-runtime-data-common-trinity, usbutils
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~), tdebase-runtime-data-common-trinity, usbutils
 Recommends: udev
 Suggests: khelpcenter-trinity, ntpdate | ntp-simple
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Description: control center for KDE
- The KDE Control Center provides you with a centralized and convenient
- way to configure all of your KDE settings.
+Description: control center for TDE
+ The Trinity Control Center provides you with a centralized and convenient
+ way to configure all of your TDE settings.
  .
  It is made up of multiple modules. Each module is a separate application,
  but the control center organizes all of these programs into a convenient
@@ -104,8 +104,8 @@ Description: control center for KDE
  configuration of Logitech mice, though the user must be a member of the
  plugdev group.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-trinity-bin
 Section: tde
@@ -115,12 +115,12 @@ Breaks: kdebase-trinity-bin (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter-trinity, gdb
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), tdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0)
-Description: core binaries for the KDE base module
+Description: core binaries for the TDE base module
  This package contains miscellaneous programs needed by other
- KDE applications, particularly those in the KDE base module.
+ TDE applications, particularly those in the TDE base module.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-data-trinity
 Section: tde
@@ -128,12 +128,12 @@ Architecture: all
 Replaces: kdebase-data-trinity (<< 4:14.0.0~)
 Breaks: kdebase-data-trinity (<< 4:14.0.0~)
 Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
-Description: shared data files for the KDE base module
+Description: shared data files for the TDE base module
  This package contains the architecture-independent shared data files
- needed for a basic KDE desktop installation.
+ needed for a basic Trinity desktop installation.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-trinity-dev
 Section: devel
@@ -141,24 +141,24 @@ Architecture: any
 Replaces: kdebase-trinity-dev (<< 4:14.0.0~)
 Breaks: kdebase-trinity-dev (<< 4:14.0.0~)
 Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs14-trinity-dev
-Description: development files for the KDE base module
+Description: development files for the TDE base module
  This package contains headers and other development files needed to
- compile software based on the KDE base module.
+ compile software based on the TDE base module.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-trinity-doc
 Section: doc
 Architecture: all
 Replaces: kdebase-trinity-doc (<< 4:14.0.0~)
 Breaks: kdebase-trinity-doc (<< 4:14.0.0~)
-Description: developer documentation for the KDE base module
- This package contains documentation for the KDE base module, of
+Description: developer documentation for the TDE base module
+ This package contains documentation for the TDE base module, of
  use more for developers creating applications than regular users.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-trinity-doc-html
 Architecture: all
@@ -166,19 +166,19 @@ Section: doc
 Replaces: kdebase-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdebase-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdebase-trinity
-Description: KDE base documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE base documentation converted to
+Description: TDE base documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE base documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/kate/. Documentation is provided for most
- KDE base packages.
+ TDE base packages.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-tdeio-plugins-trinity
 Section: tde
@@ -189,7 +189,7 @@ Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (
 Recommends: udisks2 | udisks | pmount, cryptsetup, kamera-trinity, tdemultimedia-tdeio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
-Description: core I/O slaves for KDE
+Description: core I/O slaves for TDE
  This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
@@ -199,8 +199,8 @@ Description: core I/O slaves for KDE
  service, please make sure that your user is a member of the plugdev
  group.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdepasswd-trinity
 Section: utils
@@ -208,12 +208,12 @@ Architecture: any
 Replaces: kdepasswd-trinity (<< 4:14.0.0~)
 Breaks: kdepasswd-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: password changer for KDE
+Description: password changer for TDE
  This is a simple application which allows users to change their
  system passwords.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdeprint-trinity
 Section: utils
@@ -224,15 +224,15 @@ Depends: ${shlibs:Depends}, enscript, poster, psutils
 Recommends: kghostview-trinity | postscript-viewer
 Conflicts: foomatic-db-compressed-ppds
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
-Description: print system for KDE
- This package contains the KDE printing subsystem. It can use CUPS,
+Description: print system for TDE
+ This package contains the TDE printing subsystem. It can use CUPS,
  lpd-ng or the traditional lpd. It also includes support for fax and
  pdf printing.
  .
  Installation of smbclient will make you able to use smb shared printers.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
  .
  Homepage: http://printing.kde.org
 
@@ -242,23 +242,23 @@ Architecture: any
 Replaces: kdesktop-trinity (<< 4:14.0.0~)
 Breaks: kdesktop-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs
-Description: miscellaneous binaries and files for the KDE desktop
+Description: miscellaneous binaries and files for the Trinity desktop
  This package contains miscellaneous binaries and files integral to
- the KDE desktop.
+ the Trinity desktop.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdm-trinity
 Section: tde
 Architecture: any
 Replaces: kdm-trinity (<< 4:14.0.0~)
 Breaks: kdm-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
 Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), tdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
-Description: X display manager for KDE
+Description: X display manager for TDE
  tdm manages a collection of X servers, which may be on the local host or
  remote machines. It provides services similar to those provided by init,
  getty, and login on character-based terminals: prompting for login name and
@@ -268,14 +268,14 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the tdepasswd package.
+ TDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
  already. Most users won't need this.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kfind-trinity
 Section: utils
@@ -285,12 +285,12 @@ Breaks: kfind-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Description: file-find utility for KDE 
+Description: file-find utility for TDE 
  kfind can be used to find files and directories on your
  workstations.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: khelpcenter-trinity
 Section: tde
@@ -299,30 +299,30 @@ Replaces: khelpcenter-trinity (<< 4:14.0.0~)
 Breaks: khelpcenter-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: htdig
-Description: help center for KDE
- The KDE Help Center provides documentation on how to use the KDE desktop.
+Description: help center for TDE
+ The TDE Help Center provides documentation on how to use the Trinity desktop.
  .
- The htdig package is needed to build a searchable archive of KDE
+ The htdig package is needed to build a searchable archive of TDE
  documentation.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kicker-trinity
 Section: tde
 Architecture: any
 Replaces: kicker-trinity (<< 4:14.0.0~)
 Breaks: kicker-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
-Description: desktop panel for KDE
- Kicker provides the KDE panel on you desktop. It can be used as a
+Description: desktop panel for TDE
+ Kicker provides the TDE panel on you desktop. It can be used as a
  program launcher and can load plugins to provide additional
  functionality.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: klipper-trinity
 Section: tde
@@ -337,8 +337,8 @@ Description: clipboard utility for Trinity
  take dependent on the clipboard contents. For example, it can launch a 
  web browser if the clipboard contains a URL.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kmenuedit-trinity
 Section: tde
@@ -347,12 +347,12 @@ Replaces: kmenuedit-trinity (<< 4:14.0.0~)
 Breaks: kmenuedit-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: menu editor for KDE
- The KDE menu editor allows you to make customisations to the KDE menu
+Description: menu editor for TDE
+ The TDE menu editor allows you to make customisations to the TDE menu
  structure.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: konqueror-trinity
 Section: web
@@ -363,13 +363,13 @@ Provides: info-browser, man-browser, www-browser, konqueror
 Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
-Description: KDE's advanced file manager, web browser and document viewer
- Konqueror is the file manager for the K Desktop Environment.
+Description: TDE's advanced file manager, web browser and document viewer
+ Konqueror is the file manager for the Trinity Desktop Environment.
  It supports basic file management on local UNIX filesystems,
  from simple cut/copy and paste operations to advanced remote
  and local network file browsing.
  .
- It is also the canvas for all the latest KDE technology,
+ It is also the canvas for all the latest TDE technology,
  from KIO slaves (which provide mechanisms for file access) to
  component embedding via the KParts object interface, and it
  is one of the most customizable applications available.
@@ -382,8 +382,8 @@ Description: KDE's advanced file manager, web browser and document viewer
  read-only viewing components in itself to view documents without
  ever launching another application.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
  .
  Homepage: http://konqueror.kde.org
 
@@ -396,8 +396,8 @@ Depends: ${shlibs:Depends}, konqueror-trinity
 Description: Netscape plugin support for Konqueror
  This package includes support for Netscape plugins in Konqueror.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: konsole-trinity
 Section: tde
@@ -407,9 +407,9 @@ Breaks: konsole-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Provides: x-terminal-emulator
-Description: X terminal emulator for KDE
+Description: X terminal emulator for TDE
  Konsole is an X terminal emulation which provides a command-line interface
- (CLI) while using the graphical K Desktop Environment. Konsole helps to
+ (CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
  better organize user's desktop by containing multiple sessions in a single
  window (a less cluttered desktop).
  .
@@ -423,8 +423,8 @@ Description: X terminal emulator for KDE
   Shell sessions
   Root consoles sessions
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kpager-trinity
 Section: tde
@@ -433,28 +433,28 @@ Replaces: kpager-trinity (<< 4:14.0.0~)
 Breaks: kpager-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: desktop pager for KDE
- This package contains KDE's desktop pager, which displays your virtual
+Description: desktop pager for TDE
+ This package contains TDE's desktop pager, which displays your virtual
  desktops iconically in a window, along with icons of any running
  applications. It is used to switch between applications or desktops.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kpersonalizer-trinity
 Section: tde
 Architecture: any
 Replaces: kpersonalizer-trinity (<< 4:14.0.0~)
 Breaks: kpersonalizer-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
-Description: installation personalizer for KDE
- KDE Personalizer is the application that configures the KDE desktop for you.
- It's a very useful wizard that allows you to quickly change the KDE desktop to
- suit your own needs. When you run KDE for the first time, KPersonalizer is
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
+Description: installation personalizer for TDE
+ TDE Personalizer is the application that configures the Trinity desktop for you.
+ It's a very useful wizard that allows you to quickly change the Trinity desktop to
+ suit your own needs. When you run TDE for the first time, KPersonalizer is
  automatically started. KPersonalizer can also be called later.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksmserver-trinity
 Section: tde
@@ -464,33 +464,33 @@ Breaks: ksmserver-trinity (<< 4:14.0.0~)
 Provides: x-session-manager
 Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager
 Recommends: kpersonalizer-trinity (= ${Source-Version})
-Description: session manager for KDE
- This package contains the KDE session manager. It is responsible for
- restoring your KDE session on login. It is also needed to properly
- start a KDE session. It registers KDE with X display managers, and
- provides the 'starttde' command, for starting an X session with KDE
+Description: session manager for TDE
+ This package contains the TDE session manager. It is responsible for
+ restoring your TDE session on login. It is also needed to properly
+ start a TDE session. It registers TDE with X display managers, and
+ provides the 'starttde' command, for starting an X session with TDE
  from the console.
  .
- If you are running KDE for the first time for a certain user,
+ If you are running TDE for the first time for a certain user,
  kpersonalizer is used to help with setup. If it is not present,
- KDE will start, but many good defaults will not be set.
+ TDE will start, but many good defaults will not be set.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksplash-trinity
 Section: tde
 Architecture: any
 Replaces: ksplash-trinity (<< 4:14.0.0~)
 Breaks: ksplash-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
 Suggests: khelpcenter-trinity
-Description: the KDE splash screen
- This package includes the KDE Splash screen, which is seen when
- a KDE session is launched.
+Description: the TDE splash screen
+ This package includes the TDE Splash screen, which is seen when
+ a TDE session is launched.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksysguard-trinity
 Section: utils
@@ -500,12 +500,12 @@ Breaks: ksysguard-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ksysguardd-trinity (= ${Source-Version})
 Suggests: khelpcenter-trinity
 Conflicts: kpm-trinity (<< 4:3.0.0)
-Description: system guard for KDE
- KDE System Guard allows you to monitor various statistics about your
+Description: system guard for TDE
+ TDE System Guard allows you to monitor various statistics about your
  computer.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksysguardd-trinity
 Section: utils
@@ -513,13 +513,13 @@ Architecture: any
 Replaces: ksysguardd-trinity (<< 4:14.0.0~)
 Breaks: ksysguardd-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: system guard daemon for KDE
- KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+Description: system guard daemon for TDE
+ TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
  be installed on a remote machine to enable ksysguard on another machine
  to monitor it through the daemon running there.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ktip-trinity
 Section: tde
@@ -527,11 +527,11 @@ Architecture: any
 Replaces: ktip-trinity (<< 4:14.0.0~)
 Breaks: ktip-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: useful tips for KDE
- ktip provides many useful tips on using KDE when you log in.
+Description: useful tips for TDE
+ ktip provides many useful tips on using TDE when you log in.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: twin-trinity
 Section: tde
@@ -540,13 +540,13 @@ Replaces: kwin-trinity (<< 4:14.0.0~)
 Breaks: kwin-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}~), tdebase-data-trinity (<< ${KDE-Next-Version3}~), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
+Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
 Conflicts: kde-window-manager-trinity (<< 7:3.5.0)
-Description: the KDE window manager
- This package contains the default X window manager for KDE.
+Description: the TDE window manager
+ This package contains the default X window manager for TDE.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libkonq4-trinity
 Section: libs
@@ -556,11 +556,11 @@ Breaks: libkonq4-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
 Description: core libraries for Konqueror
- These libraries are used by several KDE applications, most notably
+ These libraries are used by several TDE applications, most notably
  Konqueror and the kdesktop package.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libtqt3-integration-trinity
 Section: libs
@@ -571,8 +571,8 @@ Depends: ${shlibs:Depends}
 Description: Integration library between TQt3 and TDE
  These libraries allow you to use TDE dialogs in native TQt3 applications.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libkonq4-trinity-dev
 Section: libdevel
@@ -585,8 +585,8 @@ Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
  Konqueror libraries.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: tdebase-trinity-dbg
 Section: libdevel
diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in
index 7ce1820cc..13da04878 100644
--- a/debian/lenny/tdebase/debian/control.in
+++ b/debian/lenny/tdebase/debian/control.in
@@ -12,17 +12,17 @@ Standards-Version: 3.8.4
 Package: tdebase
 Section: tde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-tdeio-plugins (>= ${Source-Version}), tdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), pmount | kfreebsd-gnu | hurd
 Recommends: tdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
-Description: base components from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: base components from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This metapackage includes the nucleus of KDE, namely the minimal package
- set necessary to run KDE as a desktop environment. This includes the
+ This metapackage includes the nucleus of TDE, namely the minimal package
+ set necessary to run TDE as a desktop environment. This includes the
  window manager, taskbar, control center, a text editor, file manager,
  web browser, X terminal emulator, and many other programs and components.
 
@@ -31,12 +31,12 @@ Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase (<< 4:3.0.0)
-Description: non-KDE application finder for KDE
+Description: non-TDE application finder for TDE
  kappfinder searches your workstation for many common applications and
  creates menu entries for them.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kate
 Section: editors
@@ -45,9 +45,9 @@ Depends: ${shlibs:Depends}
 Recommends: kregexpeditor
 Suggests: aspell | ispell | hspell, kate-plugins, khelpcenter, konsole
 Replaces: tdebase-doc (<< 4:3.0.0)
-Description: advanced text editor for KDE
+Description: advanced text editor for TDE
  Kate is a multi document editor, based on a rewritten version of the kwrite
- editing widget of KDE.
+ editing widget of TDE.
  .
  It is a multi-view editor that lets you view several instances of the same
  document with all instances being synced, or view more files at the same
@@ -65,20 +65,20 @@ Description: advanced text editor for KDE
   * Filter command
   * Global grep dialog
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kcontrol
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), usbutils
+Depends: ${shlibs:Depends}, tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3}), usbutils
 Recommends: udev
 Suggests: khelpcenter, ntpdate | ntp-simple
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Description: control center for KDE
- The KDE Control Center provides you with a centralized and convenient
- way to configure all of your KDE settings.
+Description: control center for TDE
+ The Trinity Control Center provides you with a centralized and convenient
+ way to configure all of your TDE settings.
  .
  It is made up of multiple modules. Each module is a separate application,
  but the control center organizes all of these programs into a convenient
@@ -88,8 +88,8 @@ Description: control center for KDE
  configuration of Logitech mice, though the user must be a member of the
  plugdev group.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-bin
 Section: tde
@@ -98,65 +98,65 @@ Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter, gdb
 Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2)
 Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b)
-Description: core binaries for the KDE base module
+Description: core binaries for the TDE base module
  This package contains miscellaneous programs needed by other
- KDE applications, particularly those in the KDE base module.
+ TDE applications, particularly those in the TDE base module.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-data
 Section: tde
 Architecture: all
 Conflicts: kcontrol (<< 4:3.4.2-1), twin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
-Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18)
-Description: shared data files for the KDE base module
+Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), tdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18)
+Description: shared data files for the TDE base module
  This package contains the architecture-independent shared data files
- needed for a basic KDE desktop installation.
+ needed for a basic Trinity desktop installation.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-dev
 Section: devel
 Architecture: any
 Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Description: development files for the KDE base module
+Description: development files for the TDE base module
  This package contains headers and other development files needed to
- compile software based on the KDE base module.
+ compile software based on the TDE base module.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-doc
 Section: doc
 Architecture: all
 Replaces: libkonq4-dev (<< 4:3.2.0)
-Description: developer documentation for the KDE base module
- This package contains documentation for the KDE base module, of
+Description: developer documentation for the TDE base module
+ This package contains documentation for the TDE base module, of
  use more for developers creating applications than regular users.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdebase
-Description: KDE base documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE base documentation converted to
+Description: TDE base documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE base documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/kate/. Documentation is provided for most
- KDE base packages.
+ TDE base packages.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-tdeio-plugins
 Section: tde
@@ -166,7 +166,7 @@ Recommends: pmount, kamera, tdemultimedia-tdeio-plugins
 Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
-Description: core I/O slaves for KDE
+Description: core I/O slaves for TDE
  This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
@@ -176,19 +176,19 @@ Description: core I/O slaves for KDE
  service, please make sure that your user is a member of the plugdev
  group.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
-Package: kdepasswd
+Package: tdepasswd
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: password changer for KDE
+Description: password changer for TDE
  This is a simple application which allows users to change their
  system passwords.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdeprint
 Section: utils
@@ -197,15 +197,15 @@ Depends: ${shlibs:Depends}, enscript, poster, psutils
 Recommends: kghostview | postscript-viewer
 Suggests: khelpcenter, efax | hylafax-client | mgetty-fax, smbclient
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
-Description: print system for KDE
- This package contains the KDE printing subsystem. It can use CUPS,
+Description: print system for TDE
+ This package contains the TDE printing subsystem. It can use CUPS,
  lpd-ng or the traditional lpd. It also includes support for fax and
  pdf printing.
  .
  Installation of smbclient will make you able to use smb shared printers.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
  .
  Homepage: http://printing.kde.org
 
@@ -214,21 +214,21 @@ Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), eject
 Replaces: tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Description: miscellaneous binaries and files for the KDE desktop
+Description: miscellaneous binaries and files for the Trinity desktop
  This package contains miscellaneous binaries and files integral to
- the KDE desktop.
+ the Trinity desktop.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdm
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
-Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
+Suggests: khelpcenter, ksmserver (= ${Source-Version}), tdepasswd (= ${Source-Version}), menu
 Provides: x-display-manager
-Description: X display manager for KDE
+Description: X display manager for TDE
  tdm manages a collection of X servers, which may be on the local host or
  remote machines. It provides services similar to those provided by init,
  getty, and login on character-based terminals: prompting for login name and
@@ -238,14 +238,14 @@ Description: X display manager for KDE
  XDMCP display management.
  .
  A collection of icons to associate with individual users is included with
- KDE, but as part of the kdepasswd package.
+ TDE, but as part of the tdepasswd package.
  .
  The menu package will help to provide TDM with a list of window managers
  that can be launched, if the window manager does not register with TDM
  already. Most users won't need this.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kfind
 Section: utils
@@ -254,12 +254,12 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
-Description: file-find utility for KDE 
+Description: file-find utility for TDE 
  kfind can be used to find files and directories on your
  workstations.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: khelpcenter
 Section: tde
@@ -267,29 +267,29 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: htdig
 Replaces: tdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Description: help center for KDE
- The KDE Help Center provides documentation on how to use the KDE desktop.
+Description: help center for TDE
+ The TDE Help Center provides documentation on how to use the Trinity desktop.
  .
- The htdig package is needed to build a searchable archive of KDE
+ The htdig package is needed to build a searchable archive of TDE
  documentation.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kicker
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter, kicker-applets, menu
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
-Description: desktop panel for KDE
- Kicker provides the KDE panel on you desktop. It can be used as a
+Description: desktop panel for TDE
+ Kicker provides the TDE panel on you desktop. It can be used as a
  program launcher and can load plugins to provide additional
  functionality.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: klipper
 Section: tde
@@ -297,14 +297,14 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
-Description: clipboard utility for KDE
+Description: clipboard utility for TDE
  klipper provides standard clipboard functions (cut and paste, history
  saving) plus additional features, like the ability to offer actions to 
  take dependent on the clipboard contents. For example, it can launch a 
  web browser if the clipboard contains a URL.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kmenuedit
 Section: tde
@@ -312,12 +312,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
-Description: menu editor for KDE
- The KDE menu editor allows you to make customisations to the KDE menu
+Description: menu editor for TDE
+ The TDE menu editor allows you to make customisations to the TDE menu
  structure.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: konqueror
 Section: web
@@ -327,13 +327,13 @@ Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-tdeio-plugin
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
 Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
-Description: KDE's advanced file manager, web browser and document viewer
- Konqueror is the file manager for the K Desktop Environment.
+Description: TDE's advanced file manager, web browser and document viewer
+ Konqueror is the file manager for the Trinity Desktop Environment.
  It supports basic file management on local UNIX filesystems,
  from simple cut/copy and paste operations to advanced remote
  and local network file browsing.
  .
- It is also the canvas for all the latest KDE technology,
+ It is also the canvas for all the latest TDE technology,
  from KIO slaves (which provide mechanisms for file access) to
  component embedding via the KParts object interface, and it
  is one of the most customizable applications available.
@@ -346,8 +346,8 @@ Description: KDE's advanced file manager, web browser and document viewer
  read-only viewing components in itself to view documents without
  ever launching another application.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
  .
  Homepage: http://konqueror.kde.org
 
@@ -359,8 +359,8 @@ Replaces: konqueror (<< 4:3.0.0)
 Description: Netscape plugin support for Konqueror
  This package includes support for Netscape plugins in Konqueror.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: konsole
 Section: tde
@@ -369,9 +369,9 @@ Depends: ${shlibs:Depends}
 Replaces: tdebase (<< 4:3.0.0)
 Suggests: khelpcenter
 Provides: x-terminal-emulator
-Description: X terminal emulator for KDE
+Description: X terminal emulator for TDE
  Konsole is an X terminal emulation which provides a command-line interface
- (CLI) while using the graphical K Desktop Environment. Konsole helps to
+ (CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
  better organize user's desktop by containing multiple sessions in a single
  window (a less cluttered desktop).
  .
@@ -385,8 +385,8 @@ Description: X terminal emulator for KDE
   Shell sessions
   Root consoles sessions
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kpager
 Section: tde
@@ -394,27 +394,27 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
-Description: desktop pager for KDE
- This package contains KDE's desktop pager, which displays your virtual
+Description: desktop pager for TDE
+ This package contains TDE's desktop pager, which displays your virtual
  desktops iconically in a window, along with icons of any running
  applications. It is used to switch between applications or desktops.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: kpersonalizer
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3})
 Replaces: tdebase (<< 4:3.0.0)
-Description: installation personalizer for KDE
- KDE Personalizer is the application that configures the KDE desktop for you.
- It's a very useful wizard that allows you to quickly change the KDE desktop to
- suit your own needs. When you run KDE for the first time, KPersonalizer is
+Description: installation personalizer for TDE
+ TDE Personalizer is the application that configures the Trinity desktop for you.
+ It's a very useful wizard that allows you to quickly change the Trinity desktop to
+ suit your own needs. When you run TDE for the first time, KPersonalizer is
  automatically started. KPersonalizer can also be called later.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: ksmserver
 Section: tde
@@ -423,32 +423,32 @@ Provides: x-session-manager
 Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager
 Recommends: kpersonalizer (= ${Source-Version})
 Replaces: tdebase (<< 4:3.0.0)
-Description: session manager for KDE
- This package contains the KDE session manager. It is responsible for
- restoring your KDE session on login. It is also needed to properly
- start a KDE session. It registers KDE with X display managers, and
- provides the 'starttde' command, for starting an X session with KDE
+Description: session manager for TDE
+ This package contains the TDE session manager. It is responsible for
+ restoring your TDE session on login. It is also needed to properly
+ start a TDE session. It registers TDE with X display managers, and
+ provides the 'starttde' command, for starting an X session with TDE
  from the console.
  .
- If you are running KDE for the first time for a certain user,
+ If you are running TDE for the first time for a certain user,
  kpersonalizer is used to help with setup. If it is not present,
- KDE will start, but many good defaults will not be set.
+ TDE will start, but many good defaults will not be set.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: ksplash
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3})
 Suggests: khelpcenter
 Replaces: tdebase (<< 4:3.0.0)
-Description: the KDE splash screen
- This package includes the KDE Splash screen, which is seen when
- a KDE session is launched.
+Description: the TDE splash screen
+ This package includes the TDE Splash screen, which is seen when
+ a TDE session is launched.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: ksysguard
 Section: utils
@@ -457,49 +457,49 @@ Depends: ${shlibs:Depends}, ksysguardd (= ${Source-Version})
 Suggests: khelpcenter
 Conflicts: kpm (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
-Description: system guard for KDE
- KDE System Guard allows you to monitor various statistics about your
+Description: system guard for TDE
+ TDE System Guard allows you to monitor various statistics about your
  computer.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: ksysguardd
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase (<< 4:3.0.0)
-Description: system guard daemon for KDE
- KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+Description: system guard daemon for TDE
+ TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
  be installed on a remote machine to enable ksysguard on another machine
  to monitor it through the daemon running there.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: ktip
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase (<< 4:3.0.0)
-Description: useful tips for KDE
- ktip provides many useful tips on using KDE when you log in.
+Description: useful tips for TDE
+ ktip provides many useful tips on using TDE when you log in.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: twin
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
+Suggests: tdebase-bin (= ${Source-Version}), tdebase-data (>> ${TDE-Version3}), tdebase-data (<< ${TDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
 Replaces: tdeartwork-theme-window (<< 4:3.4.0), tdebase (<< 4:3.0.0)
-Description: the KDE window manager
- This package contains the default X window manager for KDE.
+Description: the TDE window manager
+ This package contains the default X window manager for TDE.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: libkonq4
 Section: libs
@@ -508,11 +508,11 @@ Depends: ${shlibs:Depends}
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: core libraries for Konqueror
- These libraries are used by several KDE applications, most notably
+ These libraries are used by several TDE applications, most notably
  Konqueror and the kdesktop package.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: libkonq4-dev
 Section: libdevel
@@ -524,8 +524,8 @@ Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
  Konqueror libraries.
  .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'tdebase' packages for more information.
+ This package is part of TDE, and a component of the TDE base module.
+ See the 'tde' and 'tdebase' packages for more information.
 
 Package: tdebase-dbg
 Section: libdevel
diff --git a/debian/lenny/tdebase/debian/kappfinder-trinity.menu b/debian/lenny/tdebase/debian/kappfinder-trinity.menu
index d3109e3c6..55a4fde61 100644
--- a/debian/lenny/tdebase/debian/kappfinder-trinity.menu
+++ b/debian/lenny/tdebase/debian/kappfinder-trinity.menu
@@ -1,4 +1,4 @@
-?package(kappfinder):\
+?package(kappfinder-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kate-trinity.menu b/debian/lenny/tdebase/debian/kate-trinity.menu
index b22f58e72..a725ecd73 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.menu
+++ b/debian/lenny/tdebase/debian/kate-trinity.menu
@@ -1,4 +1,4 @@
-?package(kate):\
+?package(kate-trinity):\
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE,Text"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
 	command="/opt/trinity/bin/kate"
 
-?package(kate):\
+?package(kate-trinity):\
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE,Text"\
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.menu b/debian/lenny/tdebase/debian/kcontrol-trinity.menu
index 3576cdae0..655f614a8 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.menu
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcontrol):\
+?package(kcontrol-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kfind-trinity.menu b/debian/lenny/tdebase/debian/kfind-trinity.menu
index 457df9255..099be9070 100644
--- a/debian/lenny/tdebase/debian/kfind-trinity.menu
+++ b/debian/lenny/tdebase/debian/kfind-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfind):\
+?package(kfind-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
index 06387a37b..1ce08222c 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
@@ -1,4 +1,4 @@
-?package(khelpcenter):\
+?package(khelpcenter-trinity):\
 	needs="X11"\
 	section="Help"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.menu b/debian/lenny/tdebase/debian/kicker-trinity.menu
index f18046d6d..9d27a7e35 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.menu
+++ b/debian/lenny/tdebase/debian/kicker-trinity.menu
@@ -1,4 +1,4 @@
-?package(kicker):\
+?package(kicker-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.menu b/debian/lenny/tdebase/debian/klipper-trinity.menu
index d295ac398..42cf5a523 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.menu
+++ b/debian/lenny/tdebase/debian/klipper-trinity.menu
@@ -1,4 +1,4 @@
-?package(klipper):\
+?package(klipper-trinity):\
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.menu b/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
index 6901559ac..04a7ab64e 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
@@ -1,4 +1,4 @@
-?package(kmenuedit):\
+?package(kmenuedit-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.menu b/debian/lenny/tdebase/debian/konqueror-trinity.menu
index 5fed6cc8e..1d2211df6 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.menu
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.menu
@@ -1,4 +1,4 @@
-?package(konqueror):\
+?package(konqueror-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/keditbookmarks-16.xpm"\
 	command="/opt/trinity/bin/keditbookmarks"
 
-?package(konqueror):\
+?package(konqueror-trinity):\
 	needs="X11"\
 	section="Applications/Network/Web Browsing"\
 	hints="TDE,Web browsers"\
@@ -16,7 +16,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
 	command="/opt/trinity/bin/konqueror --profile webbrowsing"
 
-?package(konqueror):\
+?package(konqueror-trinity):\
 	needs="X11"\
 	section="Applications/File Management"\
 	hints="TDE,File managers"\
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.presubj b/debian/lenny/tdebase/debian/konqueror-trinity.presubj
index 9abd9e6d1..5b17bcbdf 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.presubj
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.presubj
@@ -26,5 +26,5 @@ be attached to the bug report. Screenshots of the "correct" behaviour
 
 Any bug that states "Site foo is not rendered correctly" with no further
 information will be discarded (even if at the time of the report the defect
-is obvious, with newer versions of KDE it can be hard to see if the defect
+is obvious, with newer versions of TDE it can be hard to see if the defect
 is still present, since the error might have been subtle for all we know).
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.README.Debian b/debian/lenny/tdebase/debian/konsole-trinity.README.Debian
index 82205cf2c..1efdb9472 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.README.Debian
+++ b/debian/lenny/tdebase/debian/konsole-trinity.README.Debian
@@ -1,16 +1,16 @@
 Installing konsole's bitmap fonts
 =================================
 
-Formerly, the few bitmap fonts KDE included, designed for use with Konsole,
+Formerly, the few bitmap fonts TDE included, designed for use with Konsole,
 were shipped as part of the xfonts-konsole package. However, as Konsole no
 longer uses these fonts by default, and most users no longer use bitmap
-fonts at all, KDE now includes these fonts with Konsole itself, and Debian
+fonts at all, TDE now includes these fonts with Konsole itself, and Debian
 has followed this practice, including the fonts in the konsole package, and
 eliminating the xfonts-konsole package entirely.
 
 To make use of these legacy fonts, start Konsole, and under Settings --> Font
 select "Install Bitmap...". This will allow you to copy the legacy Konsole
-fonts to $HOME/.fonts, where, after restarting KDE, all applications run by
+fonts to $HOME/.fonts, where, after restarting TDE, all applications run by
 that user, including Konsole, will be able to find them. Also make sure that
 fontconfig is configured to allow the use of bitmap fonts. If you're not sure,
 run, as root, 'dpkg-reconfigure fontconfig-config' from Konsole.
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.menu b/debian/lenny/tdebase/debian/konsole-trinity.menu
index 4b13da3ec..1ab9f2d1c 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.menu
+++ b/debian/lenny/tdebase/debian/konsole-trinity.menu
@@ -1,4 +1,4 @@
-?package(konsole):\
+?package(konsole-trinity):\
 	needs="X11"\
 	section="Applications/Terminal Emulators"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kpager-trinity.menu b/debian/lenny/tdebase/debian/kpager-trinity.menu
index 0e12f9646..c2ca09021 100644
--- a/debian/lenny/tdebase/debian/kpager-trinity.menu
+++ b/debian/lenny/tdebase/debian/kpager-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpager):\
+?package(kpager-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu b/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
index ede0b9036..c2152c8a8 100644
--- a/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
+++ b/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpersonalizer):\
+?package(kpersonalizer-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/ksysguard-trinity.menu b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
index efe01ba5e..665f15a9f 100644
--- a/debian/lenny/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksysguard):\
+?package(ksysguard-trinity):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
 	command="/opt/trinity/bin/ksysguard"
 
-?package(ksysguard):\
+?package(ksysguard-trinity):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/ktip-trinity.menu b/debian/lenny/tdebase/debian/ktip-trinity.menu
index 0f252cd2a..51cc790c4 100644
--- a/debian/lenny/tdebase/debian/ktip-trinity.menu
+++ b/debian/lenny/tdebase/debian/ktip-trinity.menu
@@ -1,4 +1,4 @@
-?package(ktip):\
+?package(ktip-trinity):\
 	needs="X11"\
 	section="Help"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/man/appletproxy-trinity.1 b/debian/lenny/tdebase/debian/man/appletproxy-trinity.1
index 38a96a27d..3ab13208f 100644
--- a/debian/lenny/tdebase/debian/man/appletproxy-trinity.1
+++ b/debian/lenny/tdebase/debian/man/appletproxy-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "K Desktop Environment" "Panel applet proxy"
+.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
 .SH NAME
 appletproxy
-\- KDE kicker panel applet proxy
+\- TDE kicker panel applet proxy
 .SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [KDE\-options] \fIdesktopfile\fP
+\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
 .SH DESCRIPTION
 \fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
 .SH OPTIONS
@@ -29,8 +29,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -113,7 +113,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -156,7 +156,7 @@ Matthias Ettrich <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/drkonqi-trinity.1 b/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
index 9371c2d9f..987164834 100644
--- a/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
+++ b/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "K Desktop Environment" "KDE crash handler"
+.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
 .SH NAME
 drkonqi
-\- KDE crash handler gives the user feedback if a program crashed
+\- TDE crash handler gives the user feedback if a program crashed
 .SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [KDE\-options] [options] 
+\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
-The KDE crash handler gives the user feedback if a program crashed.
+The TDE crash handler gives the user feedback if a program crashed.
 .SH OPTIONS
 .SS Options:
 .TP
@@ -47,8 +47,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -131,7 +131,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -168,7 +168,7 @@ Hans Petter Bieker <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/extensionproxy-trinity.1 b/debian/lenny/tdebase/debian/man/extensionproxy-trinity.1
index 36f343ed0..4ea041189 100644
--- a/debian/lenny/tdebase/debian/man/extensionproxy-trinity.1
+++ b/debian/lenny/tdebase/debian/man/extensionproxy-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "K Desktop Environment" "Panel extension proxy"
+.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
 .SH NAME
 extensionproxy
-\- KDE kicker panel extension proxy
+\- TDE kicker panel extension proxy
 .SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [KDE\-options] \fIdesktopfile\fP
+\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
 .SH DESCRIPTION
 \fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
 .SH OPTIONS
@@ -29,8 +29,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -113,7 +113,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -156,7 +156,7 @@ Matthias Ettrich <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/gentdmconf-trinity.1 b/debian/lenny/tdebase/debian/man/gentdmconf-trinity.1
index ce3c46d8b..d98e166c2 100644
--- a/debian/lenny/tdebase/debian/man/gentdmconf-trinity.1
+++ b/debian/lenny/tdebase/debian/man/gentdmconf-trinity.1
@@ -1,5 +1,5 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm"
+.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
 .SH NAME
 gentdmconf
 \- generate configuration files for tdm
@@ -84,7 +84,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kappfinder-trinity.1 b/debian/lenny/tdebase/debian/man/kappfinder-trinity.1
index c7ca7507c..ec8eae964 100644
--- a/debian/lenny/tdebase/debian/man/kappfinder-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kappfinder-trinity.1
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the KDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
+\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -26,8 +26,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -42,11 +42,11 @@ Show program license.
 Show version of program.
 .TP
 .B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.kde/share/applnk
+Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
 
 .SH SEE ALSO
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/debian/lenny/tdebase/debian/man/kasbar-trinity.1 b/debian/lenny/tdebase/debian/man/kasbar-trinity.1
index f7b07efef..7d57958d2 100644
--- a/debian/lenny/tdebase/debian/man/kasbar-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kasbar-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "K Desktop Environment" "An alternative task manager"
+.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
 .SH NAME
 kasbar
 \- An alternative task manager
 .SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [KDE\-options] [options] 
+\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
 .SH OPTIONS
@@ -20,8 +20,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -104,7 +104,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -141,7 +141,7 @@ sets the client geometry of the main widget - see man X for the argument format
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kate-trinity.1 b/debian/lenny/tdebase/debian/man/kate-trinity.1
index 7f9b54d87..e48268d6f 100644
--- a/debian/lenny/tdebase/debian/man/kate-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kate-trinity.1
@@ -1,6 +1,6 @@
 .TH KATE 1 "May 2006"
 .SH NAME
-kate \- KDE Advanced Text Editor
+kate \- TDE Advanced Text Editor
 .SH SYNOPSIS
 .B kate
 .RI [ options ] [file(s)]
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkate\fP is a powerful text editor for KDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
+\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
 
 It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
 
@@ -33,8 +33,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -75,8 +75,8 @@ is the file or the files to open
 .SH SEE ALSO
 .BR kwrite (1)
 .PP
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>, for Debian GNU/Linux, but may be used by others.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kblankscrn.kss-trinity.1 b/debian/lenny/tdebase/debian/man/kblankscrn.kss-trinity.1
index 473befef9..46b2d4e1a 100644
--- a/debian/lenny/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kblankscrn.kss-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "K Desktop Environment" "KDE screen saver"
+.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
 .SH NAME
 kblankscrn.kss
-\- KDE screensaver which shows a blank screen
+\- TDE screensaver which shows a blank screen
 .SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [KDE\-options] [options] 
+\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 \fBKBlankScreen\fP is a screensaver which shows a blank screen.
 .SH OPTIONS
@@ -29,8 +29,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -113,7 +113,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -149,7 +149,7 @@ The KDE Project <www.kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kcheckpass-trinity.1 b/debian/lenny/tdebase/debian/man/kcheckpass-trinity.1
index 113074e29..fa5a4c817 100644
--- a/debian/lenny/tdebase/debian/man/kcheckpass-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kcheckpass-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  KCHECKPASS 1 "June 2006" "K Desktop Environment" "authentication software"
+.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
 .SH NAME
 kcheckpass
 \- The KCheckPass authentication software
 .SH SYNOPSIS
 \fBkcheckpass\fP
 .SH DESCRIPTION
-\fBKCheckPass\fP is KDE's authentication program. It is meant to be
+\fBKCheckPass\fP is TDE's authentication program. It is meant to be
 used by any software in need of user authentication, most
 notably screensavers.
 .sp 1
@@ -42,7 +42,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kcminit-trinity.1 b/debian/lenny/tdebase/debian/man/kcminit-trinity.1
index 86e4db1a4..4c557456e 100644
--- a/debian/lenny/tdebase/debian/man/kcminit-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kcminit-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMINIT 1 "June 2006" "K Desktop Environment" "KDE Control Modules initialization"
+.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
 .SH NAME
 kcminit
 \- runs startups initialization for Control Modules.
 .SH SYNOPSIS
-\fBkcminit\fP [Qt\-options] [KDE\-options] [options] module 
+\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
 .SH DESCRIPTION
 \fBkcminit\fP runs startups initialization for Control Modules.
 .SH OPTIONS
@@ -26,8 +26,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -110,7 +110,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -146,7 +146,7 @@ Matthias Hoelzer\-Kluepfel <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kdcop-trinity.1 b/debian/lenny/tdebase/debian/man/kdcop-trinity.1
index 02425c769..1c01dcc47 100644
--- a/debian/lenny/tdebase/debian/man/kdcop-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kdcop-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDCOP 1 "June 2006" "K Desktop Environment" "A graphical DCOP browser/client"
+.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
 .SH NAME
 kdcop
 \- A graphical DCOP browser/client
 .SH SYNOPSIS
-\fBkdcop\fP [Qt\-options] [KDE\-options] 
+\fBkdcop\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
 their interfaces, and the interfaces' arguments. You can even execute DCOP
@@ -20,8 +20,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -104,7 +104,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -135,7 +135,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .SS
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kdcop/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kdcop/"
@@ -152,7 +152,7 @@ Ian Reinhart Geiser <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kdialog-trinity.1 b/debian/lenny/tdebase/debian/man/kdialog-trinity.1
index 3df82c3e2..243709ed1 100644
--- a/debian/lenny/tdebase/debian/man/kdialog-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kdialog-trinity.1
@@ -1,13 +1,13 @@
-.TH KDIALOG "1" "December 2002" "TDE" "KDE Application"
+.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
 .SH NAME
-kdialog \- Show KDE dialog boxes from shell scripts
+kdialog \- Show TDE dialog boxes from shell scripts
 .SH SYNOPSIS
 .B kdialog
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B kdialog
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .PP
@@ -78,8 +78,8 @@ Show help about options
 .B \-\-help\-qt
 Show Qt specific options
 .TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
 .TP
 .B \-\-help\-all
 Show all options
@@ -160,7 +160,7 @@ disable XIM.
 .TP
 .B \-\-reverse
 mirrors the whole layout of widgets.
-.SS "KDE options:"
+.SS "TDE options:"
 .TP
 .BI \-\-caption \ caption
 Use \fIcaption\fP as name in the titlebar.
@@ -199,7 +199,7 @@ Matthias Hoelzer <[email protected]> and
 David Gumbel <[email protected]>.
 .br
 .hy
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .br
 This manual page was prepared by
 .nh
diff --git a/debian/lenny/tdebase/debian/man/keditbookmarks-trinity.1 b/debian/lenny/tdebase/debian/man/keditbookmarks-trinity.1
index c9562fe1d..23606dccb 100644
--- a/debian/lenny/tdebase/debian/man/keditbookmarks-trinity.1
+++ b/debian/lenny/tdebase/debian/man/keditbookmarks-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Jan 2005" "K Desktop Environment" "Konqueror Bookmarks Editor"
+.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
 .SH NAME
 keditbookmarks
 - Konqueror Bookmark Editor
 .SH SYNOPSIS
-keditbookmarks [Qt-options] [KDE-options] [options] [file] 
+keditbookmarks [Qt-options] [TDE-options] [options] [file] 
 .SH DESCRIPTION
-Bookmark editor for KDE.
+Bookmark editor for TDE.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -59,8 +59,8 @@ Show help about options
 .B  --help-qt  
 Show Qt specific options
 .TP
-.B  --help-kde  
-Show KDE specific options
+.B  --help-tde  
+Show TDE specific options
 .TP
 .B  --help-all  
 Show all options
@@ -77,7 +77,7 @@ Show license information
 .B  --  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  --caption  <caption>
 Use 'caption' as name in the titlebar
diff --git a/debian/lenny/tdebase/debian/man/kfind-trinity.1 b/debian/lenny/tdebase/debian/man/kfind-trinity.1
index 4eee62075..55542fd66 100644
--- a/debian/lenny/tdebase/debian/man/kfind-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kfind-trinity.1
@@ -1,6 +1,6 @@
 .TH KFIND 1 "August, 25 2003"
 .SH NAME
-kfind \- KDE find tool
+kfind \- TDE find tool
 .SH SYNOPSIS
 .B kfind
 .RI [ options ]  [searchpath]
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkfind\fP is a find tool for KDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
+\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
 
 It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
 
@@ -29,8 +29,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -49,8 +49,8 @@ Show version of program.
 is the path in which the search must be done
 
 .SH SEE ALSO
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/debian/lenny/tdebase/debian/man/kfmclient-trinity.1 b/debian/lenny/tdebase/debian/man/kfmclient-trinity.1
index 193204778..67cbed380 100644
--- a/debian/lenny/tdebase/debian/man/kfmclient-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kfmclient-trinity.1
@@ -1,11 +1,11 @@
 .\" This file was generated by kdemangen.pl
 .\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
-.TH KFMCLIENT 1 "Jan 2005" "K Desktop Environment" "KDE tool for opening URLs from the command line"
+.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
 .SH NAME
 kfmclient
-- KDE tool for opening URLs from the command line
+- TDE tool for opening URLs from the command line
 .SH SYNOPSIS
-kfmclient [Qt-options] [KDE-options] [options] command [URL(s)] 
+kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
 .SH DESCRIPTION
 kfmclient is a tool for opening local and remote URLs in Konqueror from
 the command line.
@@ -29,7 +29,7 @@ window on the current active desktop if possible.
 .TP
 kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
 Opens a window using the given profile. \fIprofile\fR is a file under
-~/.kde/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
+~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
 .SS openProperties
 .TP
 kfmclient openProperties \fIurl\fR
@@ -78,8 +78,8 @@ Show help about options
 .B  --help-qt  
 Show Qt specific options
 .TP
-.B  --help-kde  
-Show KDE specific options
+.B  --help-tde  
+Show TDE specific options
 .TP
 .B  --help-all  
 Show all options
@@ -96,7 +96,7 @@ Show license information
 .B  --  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  --caption  <caption>
 Use 'caption' as name in the titlebar
diff --git a/debian/lenny/tdebase/debian/man/khotkeys-trinity.1 b/debian/lenny/tdebase/debian/man/khotkeys-trinity.1
index 5f6f3ffbc..34d754b05 100644
--- a/debian/lenny/tdebase/debian/man/khotkeys-trinity.1
+++ b/debian/lenny/tdebase/debian/man/khotkeys-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTKEYS 1 "June 2006" "K Desktop Environment" "KHotKeys daemon"
+.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
 .SH NAME
 khotkeys
 \- daemon to bind actions to triggers and conditions
 .SH SYNOPSIS
-\fBkhotkeys\fP [Qt\-options] [KDE\-options] 
+\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
 .SH OPTIONS
@@ -16,8 +16,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -100,7 +100,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -134,7 +134,7 @@ Don't run in the background.
 .SS
 
 .SH FILES
-.I ~/.kde/share/config/khotkeysrc
+.I ~/.trinity/share/config/khotkeysrc
 \fBkhotkeys\fP configuration file
 
 .SH AUTHORS
@@ -143,7 +143,7 @@ Lubos Lunak <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kicker-trinity.1 b/debian/lenny/tdebase/debian/man/kicker-trinity.1
index cc48aa37d..1d17fa199 100644
--- a/debian/lenny/tdebase/debian/man/kicker-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kicker-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "K Desktop Environment" "The KDE panel"
+.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
 .SH NAME
 kicker
-\- The KDE panel
+\- The TDE panel
 .SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [KDE\-options] 
+\fBkicker\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-\fBKicker\fP is the KDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
+\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -16,8 +16,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -100,7 +100,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -135,7 +135,7 @@ Don't run in the background.
 .SH SEE ALSO
 \fBkasbar\fP(1)
 .sp 1
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kicker/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kicker/"
@@ -164,7 +164,7 @@ Waldo Bastian <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1 b/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
index 04ebe8a44..6dae2692e 100644
--- a/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KJOBVIEWER 1 "June 2006" "K Desktop Environment" "A print job viewer"
+.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
 .SH NAME
 kjobviewer
 \- a print job viewer
 .SH SYNOPSIS
-\fBkjobviewer\fP [Qt\-options] [KDE\-options] [options] 
+\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 \fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
 .sp 1
-The details are, again, as with all other modules of \fBKDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
+The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
 .sp 1
 With kjobviewer you can...
 .IP "     \-"
@@ -64,8 +64,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -148,7 +148,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -182,7 +182,7 @@ Don't run in the background.
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kjobviewer/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kjobviewer/"
@@ -195,7 +195,7 @@ Michael Goffioul <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kmenuedit-trinity.1 b/debian/lenny/tdebase/debian/man/kmenuedit-trinity.1
index 7f861654a..fd5c7daf5 100644
--- a/debian/lenny/tdebase/debian/man/kmenuedit-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kmenuedit-trinity.1
@@ -1,6 +1,6 @@
 .TH KMENUEDIT 1 "August, 24 2003"
 .SH NAME
-kmenuedit \- editor for the KDE menu
+kmenuedit \- editor for the TDE menu
 .SH SYNOPSIS
 .B kmenuedit
 .RI [ options ]
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkmenuedit\fP is a powerful editor for the KDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
+\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -26,8 +26,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -42,8 +42,8 @@ Show program license.
 Show version of program.
 
 .SH SEE ALSO
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/debian/lenny/tdebase/debian/man/knetattach-trinity.1 b/debian/lenny/tdebase/debian/man/knetattach-trinity.1
index 53eb047d7..84bc38fcf 100644
--- a/debian/lenny/tdebase/debian/man/knetattach-trinity.1
+++ b/debian/lenny/tdebase/debian/man/knetattach-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KNETATTACH 1 "June 2006" "K Desktop Environment" "KDE Network Wizard"
+.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
 .SH NAME
 knetattach
-\- KDE Network Wizard
+\- TDE Network Wizard
 .SH SYNOPSIS
-\fBknetattach\fP [Qt\-options] [KDE\-options] 
+\fBknetattach\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-The \fBKDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your KDE Desktop.
+The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
 .sp 1
-The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your KDE desktop.
+The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
 .sp 1
 The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
 .br
@@ -30,8 +30,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -114,7 +114,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -144,7 +144,7 @@ sets the application GUI style
 sets the client geometry of the main widget - see man X for the argument format
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/knetattach/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/knetattach/"
@@ -157,7 +157,7 @@ George Staikos <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/konqueror-trinity.1 b/debian/lenny/tdebase/debian/man/konqueror-trinity.1
index d0525d008..0515c4f87 100644
--- a/debian/lenny/tdebase/debian/man/konqueror-trinity.1
+++ b/debian/lenny/tdebase/debian/man/konqueror-trinity.1
@@ -1,17 +1,17 @@
 .\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "K Desktop Environment" "Web browser, file manager, ..."
+.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
 .SH NAME
 konqueror
 - Web browser, file manager, ...
 .SH SYNOPSIS
-konqueror [Qt-options] [KDE-options] [options] [URL] 
+konqueror [Qt-options] [TDE-options] [options] [URL] 
 .SH DESCRIPTION
-Konqueror is the file manager for the K Desktop Environment.
+Konqueror is the file manager for the Trinity Desktop Environment.
 It supports basic file management on local UNIX filesystems,
 from simple cut/copy and paste operations to advanced remote
 and local network file browsing.
 
-It is also the canvas for all the latest KDE technology,
+It is also the canvas for all the latest TDE technology,
 from KIO slaves (which provide mechanisms for file access) to
 component embedding via the KParts object interface, and it
 is one of the most customizable applications available.
@@ -24,7 +24,7 @@ It is a universal viewing application, capable of embedding
 read-only viewing components in itself to view
 documents without ever launching another application.
 
-This package is part of the official KDE base module.
+This package is part of the official TDE base module.
 
 
 .SH OPTIONS
@@ -61,8 +61,8 @@ Show help about options
 .B  --help-qt  
 Show Qt specific options
 .TP
-.B  --help-kde  
-Show KDE specific options
+.B  --help-tde  
+Show TDE specific options
 .TP
 .B  --help-all  
 Show all options
@@ -79,7 +79,7 @@ Show license information
 .B  --  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  --caption  <caption>
 Use 'caption' as name in the titlebar
@@ -176,7 +176,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/konqueror/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/konqueror/'"
diff --git a/debian/lenny/tdebase/debian/man/konsole-trinity.1 b/debian/lenny/tdebase/debian/man/konsole-trinity.1
index 5b779fda3..5de5500b4 100644
--- a/debian/lenny/tdebase/debian/man/konsole-trinity.1
+++ b/debian/lenny/tdebase/debian/man/konsole-trinity.1
@@ -1,14 +1,14 @@
 .\" The draft of this file was generated by kdemangen.pl and edited after.
-.TH Konsole 1 "Nov 2005" "K Desktop Environment" ""
+.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
 .SH NAME
 .BR Konsole
-\- X terminal emulator for KDE.
+\- X terminal emulator for TDE.
 .SH SYNOPSIS
 .BR Konsole 
-[Qt\-options] [KDE\-options] [options] [args] 
+[Qt\-options] [TDE\-options] [options] [args] 
 .SH DESCRIPTION
 Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
 better organize user's desktop by containing multiple sessions in a single
 window (a less cluttered desktop).
 .PP
@@ -138,8 +138,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -158,7 +158,7 @@ End of options
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/konsole/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/konsole/'"
diff --git a/debian/lenny/tdebase/debian/man/kpager-trinity.1 b/debian/lenny/tdebase/debian/man/kpager-trinity.1
index d704d611a..63a24f267 100644
--- a/debian/lenny/tdebase/debian/man/kpager-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kpager-trinity.1
@@ -1,6 +1,6 @@
 .TH KPAGER 1 "August, 24 2003"
 .SH NAME
-kpager \- KDE desktop pager
+kpager \- Trinity desktop pager
 .SH SYNOPSIS
 .B kpager
 .RI [ options ]
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkpager\fP is a desktop pager for the KDE desktop. It creates mini-views of the different KDE desktops. These views show the real content of the desktop, or only icons. 
+\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -26,8 +26,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -44,8 +44,8 @@ Show version of program.
 .B \-\-hidden
 Create the preview of the desktops, but hide the window
 .SH SEE ALSO
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/debian/lenny/tdebase/debian/man/kpersonalizer-trinity.1 b/debian/lenny/tdebase/debian/man/kpersonalizer-trinity.1
index 311d3c4fe..01dc0b3cc 100644
--- a/debian/lenny/tdebase/debian/man/kpersonalizer-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kpersonalizer-trinity.1
@@ -1,6 +1,6 @@
 .TH KPERSONALIZER 1
 .SH NAME
-kpersonalizer - KDE basic settings wizard
+kpersonalizer - TDE basic settings wizard
 
 .SH SYNOPSIS
 
@@ -8,9 +8,9 @@ kpersonalizer - KDE basic settings wizard
 
 .SH DESCRIPTION
 
-The KDE Personalizer (KPersonalizer) is a wizard to configure KDE, and should automatically be run the first time a user runs KDE, to allow the user to configure basic KDE settings.
+The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
 .PP
-KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the KDE Control Center application.
+KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
 
 .SH OPTIONS
 
@@ -24,8 +24,8 @@ Show help about options.
 .B \-\-help-qt
 Show Qt specific options.
 .TP
-.B \-\-help-kde 
-Show KDE specific options.
+.B \-\-help-tde 
+Show TDE specific options.
 .TP
 .B \-\-help-all 
 Show all options.
@@ -46,15 +46,15 @@ Show license information.
 KPersonalizer is restarted by itself. 
 .TP
 .B \-\-before-session 
-KPersonalizer is started before the KDE session.
+KPersonalizer is started before the TDE session.
 
 .SH EXAMPLES
 .TP
 .B kpersonalizer
-Run kpersonalizer to set (or reset) KDE preferences.
+Run kpersonalizer to set (or reset) TDE preferences.
 .TP
 .B kpersonalizer --before-session
-Run kpersonalizer before the first KDE session. 
+Run kpersonalizer before the first TDE session. 
 
 .SH AUTHORS
 
diff --git a/debian/lenny/tdebase/debian/man/kprinter-trinity.1 b/debian/lenny/tdebase/debian/man/kprinter-trinity.1
index 8eaf6c4fb..a3ecdc88b 100644
--- a/debian/lenny/tdebase/debian/man/kprinter-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kprinter-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "K Desktop Environment" "A printer tool for KDE"
+.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
 .SH NAME
 kprinter
-\- a printer tool for KDE
+\- a printer tool for TDE
 .SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [KDE\-options] [options] file(s) 
+\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
 .SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any KDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
+\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
 .sp 1
 \fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
 .sp 1
@@ -30,7 +30,7 @@ tag the print job with accounting information for billing purposes,
 .IP "     \-"
 set the job priority for a higher or lower level to influence the order of the job queue,
 .IP "     \-"
-access the KDEPrint configurator,
+access the TDEPrint configurator,
 .IP "     \-"
 and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
 .SP
@@ -75,8 +75,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -159,7 +159,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -190,7 +190,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kprinter/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kprinter/"
@@ -202,7 +202,7 @@ Michael Goffioul <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/krandom.kss-trinity.1 b/debian/lenny/tdebase/debian/man/krandom.kss-trinity.1
index e2aa1a141..4a13d95ec 100644
--- a/debian/lenny/tdebase/debian/man/krandom.kss-trinity.1
+++ b/debian/lenny/tdebase/debian/man/krandom.kss-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KRANDOM.KSS 1 "June 2006" "K Desktop Environment" "KDE screen saver"
+.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
 .SH NAME
 krandom.kss
-\- Start a random KDE screen saver
+\- Start a random TDE screen saver
 .SH SYNOPSIS
-\fBkrandom.kss\fP [Qt\-options] [KDE\-options] [options] 
+\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
-\fBkrandom.kss\fP starts a random KDE screen saver.
+\fBkrandom.kss\fP starts a random TDE screen saver.
 .SH OPTIONS
 .SS Options:
 .TP
@@ -26,8 +26,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -110,7 +110,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -145,7 +145,7 @@ sets the client geometry of the main widget - see man X for the argument format
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1 b/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
index 30151e789..3bb6c4d0b 100644
--- a/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,18 +1,18 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
+.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
 \- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
-\fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
+\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
-\fBkreadconfig\fP is a command line tool to retrieve values from KDE configuration files.
+\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
 .sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the KDE standard configuration directory is used.
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
 .SS Example:
 .TP
 \fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
-read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from KDE's main configuration file
+read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
 
 .SH OPTIONS
 .SS Options:
@@ -21,7 +21,7 @@ read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from KDE's
 Use <file> instead of global config
 .TP
 .B  \-\-group  <group>
-Group to look in [KDE]
+Group to look in [TDE]
 .TP
 .B  \-\-key  <key>
 Key to look for
@@ -39,8 +39,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -123,7 +123,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -155,8 +155,8 @@ sets the client geometry of the main widget - see man X for the argument format
 
 .SH FILES
 .I /etc/trinity/system.kdeglobals
-global KDE configuration file
-.I ~/.kde/share/config
+global TDE configuration file
+.I ~/.trinity/share/config
 standard configuration directory
 
 .SH AUTHORS
@@ -166,7 +166,7 @@ Bernhard Rosenkraenzer <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/krootimage-trinity.1 b/debian/lenny/tdebase/debian/man/krootimage-trinity.1
index 66464cf62..e9b19a604 100644
--- a/debian/lenny/tdebase/debian/man/krootimage-trinity.1
+++ b/debian/lenny/tdebase/debian/man/krootimage-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program"
+.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
 .SH NAME
 krootimage
 \- set desktop background for tdm
 .SH SYNOPSIS
-\fBkrootimage\fP [Qt\-options] [KDE\-options] config 
+\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
 .SH DESCRIPTION
 \fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
 .SH OPTIONS
@@ -21,8 +21,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -105,7 +105,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -144,7 +144,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kstart-trinity.1 b/debian/lenny/tdebase/debian/man/kstart-trinity.1
index 189e6b2b2..9d3a77ddc 100644
--- a/debian/lenny/tdebase/debian/man/kstart-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kstart-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTART 1 "June 2006" "K Desktop Environment" "application launch utility"
+.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
 .SH NAME
 kstart
 \- Utility to launch applications with special window properties 
 .SH SYNOPSIS
-\fBkstart\fP [Qt\-options] [KDE\-options] [options] command 
+\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
 .SH DESCRIPTION
 Utility to launch applications with special window properties.
 .SH OPTIONS
@@ -83,8 +83,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -167,7 +167,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -208,7 +208,7 @@ Richard J. Moore <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/ksystraycmd-trinity.1 b/debian/lenny/tdebase/debian/man/ksystraycmd-trinity.1
index 73ba046e5..4807276c0 100644
--- a/debian/lenny/tdebase/debian/man/ksystraycmd-trinity.1
+++ b/debian/lenny/tdebase/debian/man/ksystraycmd-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSYSTRAYCMD 1 "June 2006" "K Desktop Environment" "system tray utility"
+.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
 .SH NAME
 ksystraycmd
 \- Allows any application to be kept in the system tray
 .SH SYNOPSIS
-\fBksystraycmd\fP [Qt\-options] [KDE\-options] [options] command 
+\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
 .SH DESCRIPTION
 The system tray is an area in which an application can display a small window.
 It may be used to display status information or provide quick access to commands.
@@ -61,8 +61,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -145,7 +145,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -182,7 +182,7 @@ Richard Moore <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/ktrash-trinity.1 b/debian/lenny/tdebase/debian/man/ktrash-trinity.1
index 06a844a8b..0094c84fa 100644
--- a/debian/lenny/tdebase/debian/man/ktrash-trinity.1
+++ b/debian/lenny/tdebase/debian/man/ktrash-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRASH 1 "June 2006" "K Desktop Environment" "helper program"
+.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
 .SH NAME
 ktrash
-\- Helper program to handle the KDE trash can
+\- Helper program to handle the TDE trash can
 .SH SYNOPSIS
-\fBktrash\fP [Qt\-options] [KDE\-options] [options]
+\fBktrash\fP [Qt\-options] [TDE\-options] [options]
 .SH DESCRIPTION
-\fBktrash\fP is a helper program to handle the KDE trash can.
+\fBktrash\fP is a helper program to handle the TDE trash can.
 .sp 1
 Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
 .SH OPTIONS
@@ -27,8 +27,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -111,7 +111,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -148,7 +148,7 @@ David Faure <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kwrite-trinity.1 b/debian/lenny/tdebase/debian/man/kwrite-trinity.1
index 93c713176..f7d39f61d 100644
--- a/debian/lenny/tdebase/debian/man/kwrite-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kwrite-trinity.1
@@ -1,6 +1,6 @@
 .TH KWRITE 1 "August, 25 2003"
 .SH NAME
-kwrite \- KDE text editor
+kwrite \- TDE text editor
 .SH SYNOPSIS
 .B kwrite
 .RI [ options ]  [file]
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBkwrite\fP is a text editor for KDE, that is a light version of \fIkate\fP.
+\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
 It allows syntax coloration for many langages.
 
 It is able to expand or collapse parts of code (C functions, ...).
@@ -30,8 +30,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -51,8 +51,8 @@ is the file to open
 .SH SEE ALSO
 .BR kate (1)
 .PP
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <[email protected]>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1 b/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
index 266bc5560..b347b9849 100644
--- a/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,15 +1,15 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
 \- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
-\fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
+\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
 .SH DESCRIPTION
-\fBkwriteconfig\fP is a command line tool to write values in KDE configuration files.
+\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
 Nonexisting files/groups/keys will be created.
 .sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the KDE standard configuration directory is used.
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
 .SS Example:
 .TP
 \fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
@@ -27,7 +27,7 @@ The value to write. Mandatory, on a shell use '' for empty
 Use <file> instead of global config
 .TP
 .B  \-\-group  <group>
-Group to look in [KDE]
+Group to look in [TDE]
 .TP
 .B  \-\-key  <key>
 Key to look for
@@ -43,8 +43,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -127,7 +127,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -166,7 +166,7 @@ Bernhard Rosenkraenzer <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/kxkb-trinity.1 b/debian/lenny/tdebase/debian/man/kxkb-trinity.1
index e06426a1b..9a6a6bcf6 100644
--- a/debian/lenny/tdebase/debian/man/kxkb-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kxkb-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "K Desktop Environment" "A utility to switch keyboard maps"
+.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
 .SH NAME
 kxkb
 \- A utility to switch keyboard maps
 .SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [KDE\-options] 
+\fBkxkb\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
 .sp 1
@@ -22,8 +22,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -106,7 +106,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -139,7 +139,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 Don't run in the background.
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kxkb/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kxkb/"
@@ -156,7 +156,7 @@ Ilya Konstantinov <kde\[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/starttde-trinity.1 b/debian/lenny/tdebase/debian/man/starttde-trinity.1
index 5ce70f453..73ab27b9c 100644
--- a/debian/lenny/tdebase/debian/man/starttde-trinity.1
+++ b/debian/lenny/tdebase/debian/man/starttde-trinity.1
@@ -1,6 +1,6 @@
 .TH starttde 1 "Jan 17, 2005"
 .SH NAME
-starttde \- Starts up the KDE Desktop Environment 
+starttde \- Starts up the Trinity Desktop Environment 
 .SH SYNOPSIS
 .B starttde
 .br
@@ -11,24 +11,24 @@ command.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
-The \fBstarttde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the Trinity Desktop Environment and
 is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
 your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
 will load your last session, or a default session that includes the standard
-KDE programs if no saved session is available.
+TDE programs if no saved session is available.
 
 \fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
 any X11R6 SM compliant program.
 
-\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
-for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
-can be used to define environment variables that will be available to all KDE 
+\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
+for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
+can be used to define environment variables that will be available to all TDE 
 programs.
 
 For anything else (that doesn't set env vars, or that needs a window manager),
-better use the ~/.kde/Autostart folder.
+better use the ~/.trinity/Autostart folder.
 
-At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
+At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
 
 
 .SH OPTIONS
diff --git a/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1 b/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
index 638673127..af48f59e6 100644
--- a/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
+.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
 .SH NAME
 tdedebugdialog
 \- A dialog box for setting preferences for debug output
 .SH SYNOPSIS
-\fBtdedebugdialog\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 \fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
 .sp 1
@@ -35,7 +35,7 @@ In this Combobox, you can choose where the messages should be output. The choice
 \fBFilename:\fP
 .br
 This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level KDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
+Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
 .sp 1
 When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
 
@@ -58,8 +58,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -142,7 +142,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -176,11 +176,11 @@ Don't run in the background.
 .SS
 
 .SH FILES
-.I ~/.kde/share/config/kdebugrc
+.I ~/.trinity/share/config/kdebugrc
 \fBtdedebugdialog\fP configuration file
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/tdedebugdialog/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/tdedebugdialog/"
@@ -193,7 +193,7 @@ David Faure <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
index 06dce313c..1e7b055f6 100644
--- a/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "K Desktop Environment" "helper program"
+.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
 .SH NAME
 tdeio_media_mounthelper
 \- tdeio_media_mounthelper
 .SH SYNOPSIS
-\fBtdeio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL 
+\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
 .SH DESCRIPTION
-\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem.
+\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -35,8 +35,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -119,7 +119,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -156,7 +156,7 @@ Kevin Ottens <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
index f700510ad..270dd86e6 100644
--- a/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script"
+.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
 .SH NAME
 tdeio_system_documenthelper
-\- KDE helper script used by document.desktop
+\- TDE helper script used by document.desktop
 .SH SYNOPSIS
 \fBtdeio_system_documenthelper\fP
 
@@ -15,7 +15,7 @@ Kevin Ottens <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1 b/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1
index 67dcedf44..e09aff0e2 100644
--- a/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdepasswd-trinity.1
@@ -4,7 +4,7 @@
 tdepasswd \- graphical frontend to change the user's password
 
 .SH SYNOPSIS
-.B tdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR
+.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
 
 .SH DESCRIPTION
 Changes a UNIX password.
@@ -21,8 +21,8 @@ Show help about options
 Show Qt specific options
 .TP
 .HP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
 .TP
 .HP
 .B \-\-help\-all
@@ -124,7 +124,7 @@ Disable XIM.
 .B \-\-reverse
 Mirrors the whole layout of widgets.
 .TP
-.B KDE options:
+.B TDE options:
 .TP
 .HP
 .B \-\-caption <caption>
diff --git a/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1 b/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
index 353fb6529..e407c294e 100644
--- a/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
+.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
 .SH NAME
 tdeprintfax
 \- a interface to fax-packages
 .SH SYNOPSIS
-\fBtdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
+\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
 .SH DESCRIPTION
 \fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
 .SH OPTIONS
@@ -32,8 +32,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -116,7 +116,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -153,7 +153,7 @@ Michael Goffioul <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdesu-trinity.1 b/debian/lenny/tdebase/debian/man/tdesu-trinity.1
index 8befa3c39..fa8c45e09 100644
--- a/debian/lenny/tdebase/debian/man/tdesu-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdesu-trinity.1
@@ -1,12 +1,12 @@
-.TH TDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
+.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
 .SH NAME
 tdesu \- Runs a program with elevated privileges.
 .SH SYNOPSIS
-\fBtdesu\fR [Qt\-options] [KDE\-options] [tdesu options] command 
+\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
 .SH DESCRIPTION
 Runs a program with elevated privileges.
 .PP
-KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
+TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
 .PP
 \fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
 .PP
@@ -20,8 +20,8 @@ Show help about options
 .B  --help-qt
 Show Qt specific options
 .TP
-.B  --help-kde
-Show KDE specific options
+.B  --help-tde
+Show TDE specific options
 .TP
 .B  --help-all
 Show all options
@@ -78,7 +78,7 @@ Specifies the command to run
 
 .SH CONFIGURATION FILES
 .PP
-\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .kde/share/config/tdesurc. Alternative a section could be added to kdeglobals.
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
 .SH EXAMPLE
 The configuration item for the configuration files is the following:
 .br
@@ -87,7 +87,7 @@ The configuration item for the configuration files is the following:
 super-user-command=sudo
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
+Full user documentation is available through the TDE Help Center. You can also enter the URL
 .BR help:/tdesu/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/tdesu/'"
diff --git a/debian/lenny/tdebase/debian/man/tdm-trinity.1 b/debian/lenny/tdebase/debian/man/tdm-trinity.1
index 4add90a82..1150fe5a8 100644
--- a/debian/lenny/tdebase/debian/man/tdm-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdm-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager"
+.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
 .SH NAME
 tdm
-\- KDE Display Manager
+\- Trinity Display Manager
 .SH SYNOPSIS
 \fBtdm\fP [options] [tty]
 .SH DESCRIPTION
-\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
+\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
 .br
 \fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
 .sp 1
@@ -93,7 +93,7 @@ output of this script is displayed in the chooser window
 Information about \fBtdm\fP and its options
 .sp 1
 .RE
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/tdm/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/tdm/"
@@ -109,7 +109,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdm_config-trinity.1 b/debian/lenny/tdebase/debian/man/tdm_config-trinity.1
index d9325214a..b8753b168 100644
--- a/debian/lenny/tdebase/debian/man/tdm_config-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdm_config-trinity.1
@@ -1,5 +1,5 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program"
+.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
 .SH NAME
 tdm_config
 \- helper programm for tdm to read configuration files
@@ -15,7 +15,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdm_greet-trinity.1 b/debian/lenny/tdebase/debian/man/tdm_greet-trinity.1
index c33f57d5f..10b7bde6e 100644
--- a/debian/lenny/tdebase/debian/man/tdm_greet-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdm_greet-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module"
+.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
 .SH NAME
 tdm_greet
-\- KDE greeter module for tdm
+\- TDE greeter module for tdm
 .SH SYNOPSIS
 \fBtdm_greet\fP
 .SH DESCRIPTION
-\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog.
+\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
 .SH SEE ALSO
 .BR tdm (1)
 .SH AUTHORS
@@ -15,7 +15,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/man/tdmctl-trinity.1 b/debian/lenny/tdebase/debian/man/tdmctl-trinity.1
index a1a0bb622..82be6ae16 100644
--- a/debian/lenny/tdebase/debian/man/tdmctl-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdmctl-trinity.1
@@ -1,5 +1,5 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application"
+.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
 .SH NAME
 tdmctl
 \- tdm remote control application
@@ -213,7 +213,7 @@ Oswald Buddenhagen <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/lenny/tdebase/debian/not-installed.list b/debian/lenny/tdebase/debian/not-installed.list
index bbc3e466f..4e1daf6a1 100644
--- a/debian/lenny/tdebase/debian/not-installed.list
+++ b/debian/lenny/tdebase/debian/not-installed.list
@@ -45,12 +45,12 @@ This is deliberate.
  - cruft, as tdebase no longer installs any system fonts.
 
 /usr/share/apps/kappfinder/apps/Office/lyx.desktop
- - a lyx.desktop that works in KDE is provided by lyx-qt, so this just
+ - a lyx.desktop that works in TDE is provided by lyx-qt, so this just
    confuses users.
 
 /usr/share/apps/kcmview1394/oui.db
  - this file is installed, but manually, in debian/rules, since the
-   KDE build system can't be relied on to do it itself on !Linux.
+   TDE build system can't be relied on to do it itself on !Linux.
 
 /usr/share/apps/kcontrol/pics/energybig.png
 /usr/share/apps/kcontrol/pics/lo-energy.png
diff --git a/debian/lenny/tdebase/debian/po/ar.po b/debian/lenny/tdebase/debian/po/ar.po
index 357d6e241..af855c26a 100644
--- a/debian/lenny/tdebase/debian/po/ar.po
+++ b/debian/lenny/tdebase/debian/po/ar.po
@@ -78,7 +78,7 @@ msgstr "هل تود إيقاف تشغيل عفريت tdm؟"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "يكون عفريت مدير سطح مكتب كي (tdm) عادة موقفاً عند ترقية الحزمة "
diff --git a/debian/lenny/tdebase/debian/po/ca.po b/debian/lenny/tdebase/debian/po/ca.po
index 79fbf80a5..8ebfc8aef 100644
--- a/debian/lenny/tdebase/debian/po/ca.po
+++ b/debian/lenny/tdebase/debian/po/ca.po
@@ -1,146 +1,146 @@
-# translation of ca.po to Catalan

-# debconf templates for xorg-x11 package

-# Catalan translation

-#

-# $Id: ca.po 1273 2006-02-21 10:58:12Z ender $

-#

-# Copyrights:

-#

-# This file is distributed under the same license as the xorg-x11 package.

-# Please see debian/copyright.

-#

-#    Translators, if you are not familiar with the PO format, gettext

-#    documentation is worth reading, especially sections dedicated to

-#    this format, e.g. by running:

-#         info -n '(gettext)PO Files'

-#         info -n '(gettext)Header Entry'

-#

-#    Some information specific to po-debconf are available at

-#            /opt/trinity/share/doc/po-debconf/README-trans

-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans

-#

-#    Developers do not need to manually edit POT or PO files.

-#

-# Branden Robinson, 2000-2004.

-# Ivan Vilata i Balaguer <net.selidor@ivan>, 2002-2007.

-# Leopold Palomo <[email protected]>, 2007.

-msgid ""

-msgstr ""

-"Project-Id-Version: ca\n"

-"Report-Msgid-Bugs-To: [email protected]\n"

-"POT-Creation-Date: 2007-03-23 07:15+0100\n"

-"PO-Revision-Date: 2007-04-12 12:50+0200\n"

-"Last-Translator: Leopold Palomo <[email protected]>\n"

-"Language-Team: Catalan <[email protected]>\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"X-Generator: KBabel 1.11.4\n"

-

-#. Type: select

-#. Description

-#: ../tdm.templates:1001

-msgid "Default display manager:"

-msgstr "Escolliu el gestor de pantalla:"

-

-#. Type: select

-#. Description

-#: ../tdm.templates:1001

-msgid ""

-"A display manager is a program that provides graphical login capabilities "

-"for the X Window System."

-msgstr ""

-"Un gestor de pantalla (display manager) és un programa que proporciona la "

-"capacitat d’un quadre gràfic d’entrada (login) a l’X Window System."

-

-#. Type: select

-#. Description

-#: ../tdm.templates:1001

-msgid ""

-"Only one display manager can manage a given X server, but multiple display "

-"manager packages are installed. Please select which display manager should "

-"run by default."

-msgstr ""

-"Només un gestor de pantalla pot gestionar un servidor X determinat, però "

-"teniu instaŀlats diversos paquets de gestor de pantalla.  Per favor, "

-"escolliu quin gestor de pantalla s'executarà per defecte."

-

-#. Type: select

-#. Description

-#: ../tdm.templates:1001

-msgid ""

-"Multiple display managers can run simultaneously if they are configured to "

-"manage different servers; to achieve this, configure the display managers "

-"accordingly, edit each of their init scripts in /etc/init.d, and disable the "

-"check for a default display manager."

-msgstr ""

-"Poden haver diversos gestors de pantalla corrent simultàniament si es "

-"configuren per a gestionar diferents servidors; per a aconseguir açò, "

-"configureu adequadament els gestors de pantalla, editeu cadascun dels seus "

-"scripts d’inici en «/etc/init.d», i deshabiliteu la comprovació de gestor de "

-"pantalla per defecte."

-

-#. Type: boolean

-#. Description

-#: ../tdm.templates:3001

-msgid "Stop the tdm daemon?"

-msgstr "Voleu detenir el dimoni «tdm»?"

-

-#. Type: boolean

-#. Description

-#: ../tdm.templates:3001

-msgid ""

-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "

-"and removal, but it appears to be managing at least one running X session."

-msgstr ""

-"El dimoni gestor de pantalla de KDE, (tdm), sol ser detingut en actualitzar-ne "

-"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "

-"sessió X activa."

-

-#. Type: boolean

-#. Description

-#: ../tdm.templates:3001

-msgid ""

-"If tdm is stopped now, any X sessions it manages will be terminated. "

-"Otherwise, the new version will take effect the next time the daemon is "

-"restarted."

-msgstr ""

-"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant.  "

-"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "

-"següent volta que el dimoni es reinicie."

-

-msgid ""

-"The X display manager (tdm) daemon is typically stopped on package "

-"upgrade and removal, but it appears to be managing at least one running X "

-"session."

-msgstr ""

-"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzar‐ne"

-"i eliminar‐ne el paquet, però sembla que ara està gestionant almenys "

-"una sessió X activa."

-

-msgid "Select the desired default display manager."

-msgstr "Seleccioneu el quadre gràfic d'entrada per defecte que desitgeu."

-

-msgid ""

-"Only one display manager can manage a given X server, but multiple "

-"display manager packages are installed.  Please select which display "

-"manager should run by default."

-msgstr ""

-"Un quadre gràfic d'entrada sols pot gestionar alhora un únic servidor X, "

-"però podeu tindre instal·lats múltiples paquets de quadre gràfic "

-"d'entrada. Si us plau, seleccioneu quin quadre gràfic d'entrada desitgeu "

-"que s'executi per defecte."

-

-msgid ""

-"(Multiple display managers can run simultaneously if they are configured "

-"to manage different servers; to achieve this, configure the display "

-"managers accordingly, edit each of their init scripts in /etc/init.d, and "

-"disable the check for a default display manager.)"

-msgstr ""

-"(Es poden executar múltiples quadres gràfics d'entrada simultàniament, "

-"però sols si aquests estan configurats per a gestionar diferents "

-"servidors X; per a fer això, configureu els quadres gràfics d'entrada "

-"conseqüentment, editeu cadascun dels seus scripts d'arrencada en /etc/init.d "

-"i deshabiliteu la comprovació per a un quadre gràfic d'entrada per "

-"defecte.)"

-

+# translation of ca.po to Catalan
+# debconf templates for xorg-x11 package
+# Catalan translation
+#
+# $Id: ca.po 1273 2006-02-21 10:58:12Z ender $
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /opt/trinity/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Branden Robinson, 2000-2004.
+# Ivan Vilata i Balaguer <net.selidor@ivan>, 2002-2007.
+# Leopold Palomo <[email protected]>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ca\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-12 12:50+0200\n"
+"Last-Translator: Leopold Palomo <[email protected]>\n"
+"Language-Team: Catalan <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../tdm.templates:1001
+msgid "Default display manager:"
+msgstr "Escolliu el gestor de pantalla:"
+
+#. Type: select
+#. Description
+#: ../tdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un gestor de pantalla (display manager) és un programa que proporciona la "
+"capacitat d’un quadre gràfic d’entrada (login) a l’X Window System."
+
+#. Type: select
+#. Description
+#: ../tdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Només un gestor de pantalla pot gestionar un servidor X determinat, però "
+"teniu instaŀlats diversos paquets de gestor de pantalla.  Per favor, "
+"escolliu quin gestor de pantalla s'executarà per defecte."
+
+#. Type: select
+#. Description
+#: ../tdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Poden haver diversos gestors de pantalla corrent simultàniament si es "
+"configuren per a gestionar diferents servidors; per a aconseguir açò, "
+"configureu adequadament els gestors de pantalla, editeu cadascun dels seus "
+"scripts d’inici en «/etc/init.d», i deshabiliteu la comprovació de gestor de "
+"pantalla per defecte."
+
+#. Type: boolean
+#. Description
+#: ../tdm.templates:3001
+msgid "Stop the tdm daemon?"
+msgstr "Voleu detenir el dimoni «tdm»?"
+
+#. Type: boolean
+#. Description
+#: ../tdm.templates:3001
+msgid ""
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"El dimoni gestor de pantalla de TDE, (tdm), sol ser detingut en actualitzar-ne "
+"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
+"sessió X activa."
+
+#. Type: boolean
+#. Description
+#: ../tdm.templates:3001
+msgid ""
+"If tdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant.  "
+"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "
+"següent volta que el dimoni es reinicie."
+
+msgid ""
+"The X display manager (tdm) daemon is typically stopped on package "
+"upgrade and removal, but it appears to be managing at least one running X "
+"session."
+msgstr ""
+"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzar‐ne"
+"i eliminar‐ne el paquet, però sembla que ara està gestionant almenys "
+"una sessió X activa."
+
+msgid "Select the desired default display manager."
+msgstr "Seleccioneu el quadre gràfic d'entrada per defecte que desitgeu."
+
+msgid ""
+"Only one display manager can manage a given X server, but multiple "
+"display manager packages are installed.  Please select which display "
+"manager should run by default."
+msgstr ""
+"Un quadre gràfic d'entrada sols pot gestionar alhora un únic servidor X, "
+"però podeu tindre instal·lats múltiples paquets de quadre gràfic "
+"d'entrada. Si us plau, seleccioneu quin quadre gràfic d'entrada desitgeu "
+"que s'executi per defecte."
+
+msgid ""
+"(Multiple display managers can run simultaneously if they are configured "
+"to manage different servers; to achieve this, configure the display "
+"managers accordingly, edit each of their init scripts in /etc/init.d, and "
+"disable the check for a default display manager.)"
+msgstr ""
+"(Es poden executar múltiples quadres gràfics d'entrada simultàniament, "
+"però sols si aquests estan configurats per a gestionar diferents "
+"servidors X; per a fer això, configureu els quadres gràfics d'entrada "
+"conseqüentment, editeu cadascun dels seus scripts d'arrencada en /etc/init.d "
+"i deshabiliteu la comprovació per a un quadre gràfic d'entrada per "
+"defecte.)"
+
diff --git a/debian/lenny/tdebase/debian/po/cs.po b/debian/lenny/tdebase/debian/po/cs.po
index 942d5d31d..7cde2a782 100644
--- a/debian/lenny/tdebase/debian/po/cs.po
+++ b/debian/lenny/tdebase/debian/po/cs.po
@@ -85,10 +85,10 @@ msgstr "Zastavit démona tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Démon tdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění "
+"Démon tdm (Trinity Desktop manager) je obvykle při aktualizaci nebo odstranění "
 "balíku zastaven, ale zdá se, že spravuje minimálně jedno X sezení."
 
 #. Type: boolean
@@ -138,13 +138,13 @@ msgstr ""
 #~ msgstr "Chcete zastavit daemona tdm?"
 
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
 #~ "take effect the next time the daemon is restarted."
 #~ msgstr ""
-#~ "Daemon tdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění "
+#~ "Daemon tdm (Trinity Desktop manager) je obvykle při aktualizaci nebo odstranění "
 #~ "balíku zastaven, ale zdá se, že právě spravuje minimálně jedno X sezení. "
 #~ "Pokud by byl tdm zastaven nyní, všechna jím spravovaná X sezení by byla "
 #~ "ukončena. V opačném případě můžene nechat tdm běžet a nová verze se "
diff --git a/debian/lenny/tdebase/debian/po/da.po b/debian/lenny/tdebase/debian/po/da.po
index d4b081f65..c32569242 100644
--- a/debian/lenny/tdebase/debian/po/da.po
+++ b/debian/lenny/tdebase/debian/po/da.po
@@ -79,7 +79,7 @@ msgstr "Stop tdm-d�monen?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "Skrivebordsh�ndterings-d�monen tdm stoppes typisk ved opgradering og "
diff --git a/debian/lenny/tdebase/debian/po/de.po b/debian/lenny/tdebase/debian/po/de.po
index 9b88c7ac7..9bbab12df 100644
--- a/debian/lenny/tdebase/debian/po/de.po
+++ b/debian/lenny/tdebase/debian/po/de.po
@@ -96,10 +96,10 @@ msgstr "Soll der tdm-Dienst gestoppt werden?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The TDE Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Der TDE Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
+"Der Trinity Display Manager (tdm) Dienst wird meist beim Aktualisieren oder "
 "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-"
 "Sitzung zu verwalten."
 
diff --git a/debian/lenny/tdebase/debian/po/el.po b/debian/lenny/tdebase/debian/po/el.po
index e34782d24..8f83e1c21 100644
--- a/debian/lenny/tdebase/debian/po/el.po
+++ b/debian/lenny/tdebase/debian/po/el.po
@@ -92,7 +92,7 @@ msgstr "Θέλετε να σταματήσετε να χρησιμοποιείτ
 #: ../tdm.templates:3001
 #, fuzzy
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (tdm) "
diff --git a/debian/lenny/tdebase/debian/po/es.po b/debian/lenny/tdebase/debian/po/es.po
index b5f64326b..0cd68138d 100644
--- a/debian/lenny/tdebase/debian/po/es.po
+++ b/debian/lenny/tdebase/debian/po/es.po
@@ -85,9 +85,9 @@ msgstr "�Desea detener el daemon tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
-msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa."
+msgstr "Normalmente se detiene el daemon del gestor de sesiones de TDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa."
 
 #. Type: boolean
 #. Description
diff --git a/debian/lenny/tdebase/debian/po/eu.po b/debian/lenny/tdebase/debian/po/eu.po
index 52a0de5ab..82449d87b 100644
--- a/debian/lenny/tdebase/debian/po/eu.po
+++ b/debian/lenny/tdebase/debian/po/eu.po
@@ -89,7 +89,7 @@ msgstr "Kdm deabrua gelditu?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "K Pantaila Kudeatzaile (tdm) deabrua arruntean gelditu egiten da pakete "
diff --git a/debian/lenny/tdebase/debian/po/fi.po b/debian/lenny/tdebase/debian/po/fi.po
index d5a51c9d7..1a4ac88ac 100644
--- a/debian/lenny/tdebase/debian/po/fi.po
+++ b/debian/lenny/tdebase/debian/po/fi.po
@@ -45,8 +45,8 @@ msgstr "Pysäytetäänkö tdm-taustaohjelma?"
 #. Type: boolean
 #. Description
 #: ../tdm.templates:3001
-msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
-msgstr "K Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa."
+msgid "The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
+msgstr "Trinity Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa."
 
 #. Type: boolean
 #. Description
diff --git a/debian/lenny/tdebase/debian/po/fr.po b/debian/lenny/tdebase/debian/po/fr.po
index 15eabf815..63f9a1d54 100644
--- a/debian/lenny/tdebase/debian/po/fr.po
+++ b/debian/lenny/tdebase/debian/po/fr.po
@@ -94,10 +94,10 @@ msgstr "Faut-il arrêter le démon tdm ?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Le gestionnaire de sessions KDE (tdm) est généralement arrêté lors de la mise "
+"Le gestionnaire de sessions TDE (tdm) est généralement arrêté lors de la mise "
 "à jour ou de la suppression du paquet. Cependant, il semble qu'il gère "
 "actuellement encore au moins une session X."
 
diff --git a/debian/lenny/tdebase/debian/po/gl.po b/debian/lenny/tdebase/debian/po/gl.po
index d40bb853c..c793d5880 100644
--- a/debian/lenny/tdebase/debian/po/gl.po
+++ b/debian/lenny/tdebase/debian/po/gl.po
@@ -68,10 +68,10 @@ msgstr "¿Deter o servizo de tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Adoita se deter o servizo do xestor de pantalla de KDE (tdm) ao actualizar "
+"Adoita se deter o servizo do xestor de pantalla de TDE (tdm) ao actualizar "
 "ou eliminar o paquete, pero semella que está a xestionar alomenos unha "
 "sesión X en execución."
 
@@ -122,13 +122,13 @@ msgstr ""
 #~ msgstr "¿Quere deter o daemon de tdm?"
 
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
 #~ "take effect the next time the daemon is restarted."
 #~ msgstr ""
-#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (tdm) ao "
+#~ "Normalmente adóitase deter o daemon do xestor de pantalla de TDE (tdm) ao "
 #~ "actualizar ou eliminar o paquete, pero semella que está a xestionar "
 #~ "alomenos unha sesión X en execución. Se se detén tdm agora, hase cortar "
 #~ "calquera sesión X que xestione. Se non, pode deixar tdm a se executar, e "
diff --git a/debian/lenny/tdebase/debian/po/it.po b/debian/lenny/tdebase/debian/po/it.po
index 531d420ce..07a919ef4 100644
--- a/debian/lenny/tdebase/debian/po/it.po
+++ b/debian/lenny/tdebase/debian/po/it.po
@@ -90,10 +90,10 @@ msgstr "Arrestare il demone tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Il demone del display manager KDE (tdm) viene tipicamente fermato in fase "
+"Il demone del display manager TDE (tdm) viene tipicamente fermato in fase "
 "di aggiornamento o rimozione del pacchetto, ma pare che al momento stia "
 "gestendo almeno una sessione attiva di X."
 
diff --git a/debian/lenny/tdebase/debian/po/ja.po b/debian/lenny/tdebase/debian/po/ja.po
index e749468fc..a2062712c 100644
--- a/debian/lenny/tdebase/debian/po/ja.po
+++ b/debian/lenny/tdebase/debian/po/ja.po
@@ -89,7 +89,7 @@ msgstr "tdm デーモンを停止しますか?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr "K デスクトップマネージャ (tdm) デーモンは、普通、パッケージの更新や削除の際に停止させられます。しかし tdm は現在動作中の X セッションを最低ひとつは管理しているようです。"
 
@@ -143,13 +143,13 @@ msgstr ""
 #~ msgstr "tdm デーモンを停止したいですか?"
 
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
 #~ "take effect the next time the daemon is restarted."
 #~ msgstr ""
-#~ "K Desktop manager (tdm) デーモンは通常、パッケージの更新および削除時に停止"
+#~ "Trinity Desktop manager (tdm) デーモンは通常、パッケージの更新および削除時に停止"
 #~ "しますが、少なくとも 1 つの動作中の X セッションを管理しているようです。"
 #~ "tdm を今停止すると、これが管理する X セッションは殺されます。その代わり"
 #~ "に、tdm を動作しているままにしておき、新しいバージョンは次回のデーモンの再"
diff --git a/debian/lenny/tdebase/debian/po/ko.po b/debian/lenny/tdebase/debian/po/ko.po
index 6bde61a03..a357bbcf2 100644
--- a/debian/lenny/tdebase/debian/po/ko.po
+++ b/debian/lenny/tdebase/debian/po/ko.po
@@ -67,7 +67,7 @@ msgstr "tdm 데몬을 중지시킬까요?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "K 데스크탑 관리자(tdm) 데몬은 일반적으로 꾸러미를 설치하고 업그레이드할 때 "
diff --git a/debian/lenny/tdebase/debian/po/ml.po b/debian/lenny/tdebase/debian/po/ml.po
index 9e28db764..9b0d050ed 100644
--- a/debian/lenny/tdebase/debian/po/ml.po
+++ b/debian/lenny/tdebase/debian/po/ml.po
@@ -67,7 +67,7 @@ msgstr "tdm ഡീമണെ നിര്‍ത്തിക്കോട്ട�
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "കെ പ്രദര്‍ശന മാനേജര്‍ (tdm) ഡീമണ്‍ സാധാരണയായി പാക്കേജ്  പുതുക്കലിന്റേയും നീക്കം "
diff --git a/debian/lenny/tdebase/debian/po/nb.po b/debian/lenny/tdebase/debian/po/nb.po
index b61dde1bb..be373ed96 100644
--- a/debian/lenny/tdebase/debian/po/nb.po
+++ b/debian/lenny/tdebase/debian/po/nb.po
@@ -67,10 +67,10 @@ msgstr "Stoppe tdm-nissen?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Nissen K Desktop Manager (tdm) stoppes normalt når dens pakke fjernes eller "
+"Nissen Trinity Desktop Manager (tdm) stoppes normalt når dens pakke fjernes eller "
 "oppgraderes, men det ser ut til at den styrer minst en pågående X-økt."
 
 #. Type: boolean
diff --git a/debian/lenny/tdebase/debian/po/nl.po b/debian/lenny/tdebase/debian/po/nl.po
index cd8cbc401..246928578 100644
--- a/debian/lenny/tdebase/debian/po/nl.po
+++ b/debian/lenny/tdebase/debian/po/nl.po
@@ -69,7 +69,7 @@ msgstr "Wilt u de tdm-achtergronddienst stoppen?"
 #. Type: boolean
 #. Description
 #: ../tdm.templates:3001
-msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
+msgid "The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
 msgstr "Normaal wordt de tdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket tdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren."
 
 #. Type: boolean
@@ -110,13 +110,13 @@ msgstr "Als tdm nu gestopt wordt, worden alle door tdm beheerde X-sessies afgesl
 #~ msgid "Do you wish to stop the tdm daemon?"
 #~ msgstr "Wilt u de tdm-achtergronddienst stoppen?"
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
 #~ "take effect the next time the daemon is restarted."
 #~ msgstr ""
-#~ "De K Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij "
+#~ "De Trinity Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij "
 #~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één "
 #~ "actieve X-sessie te beheren. Als tdm nu wordt gestopt, dan zullen alle X-"
 #~ "sessies die het beheert worden beëindigd. Anders kunt u tdm laten draaien "
diff --git a/debian/lenny/tdebase/debian/po/pl.po b/debian/lenny/tdebase/debian/po/pl.po
index 991400113..d6a6b2aa4 100644
--- a/debian/lenny/tdebase/debian/po/pl.po
+++ b/debian/lenny/tdebase/debian/po/pl.po
@@ -81,10 +81,10 @@ msgstr "Czy chcesz zatrzyma� daemona tdm?"
 #: ../tdm.templates:3001
 #, fuzzy
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
+"Daemon Trinity Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
 "usuwania pakietu tdm, ale wygl�da na to, �e w tej chwili zarz�dza on "
 "conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, "
 "wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie "
@@ -100,7 +100,7 @@ msgid ""
 "Otherwise, the new version will take effect the next time the daemon is "
 "restarted."
 msgstr ""
-"Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
+"Daemon Trinity Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
 "usuwania pakietu tdm, ale wygl�da na to, �e w tej chwili zarz�dza on "
 "conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, "
 "wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie "
diff --git a/debian/lenny/tdebase/debian/po/pt.po b/debian/lenny/tdebase/debian/po/pt.po
index 7526913c8..4fec6a6c6 100644
--- a/debian/lenny/tdebase/debian/po/pt.po
+++ b/debian/lenny/tdebase/debian/po/pt.po
@@ -71,7 +71,7 @@ msgstr "Deseja parar o daemon tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização ou "
@@ -126,7 +126,7 @@ msgstr ""
 #~ msgstr "Deseja desligar o daemon tdm?"
 
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
diff --git a/debian/lenny/tdebase/debian/po/pt_BR.po b/debian/lenny/tdebase/debian/po/pt_BR.po
index ddb8d98fa..d01bf0dc7 100644
--- a/debian/lenny/tdebase/debian/po/pt_BR.po
+++ b/debian/lenny/tdebase/debian/po/pt_BR.po
@@ -73,9 +73,9 @@ msgstr "Deseja parar o daemon tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
-msgstr "O K Desktop manager (tdm) é tipicamente parado em atualizações e "
+msgstr "O Trinity Desktop manager (tdm) é tipicamente parado em atualizações e "
 "remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " 
 "seção X em execução."
 
diff --git a/debian/lenny/tdebase/debian/po/ro.po b/debian/lenny/tdebase/debian/po/ro.po
index c438c8661..3db232dce 100644
--- a/debian/lenny/tdebase/debian/po/ro.po
+++ b/debian/lenny/tdebase/debian/po/ro.po
@@ -76,10 +76,10 @@ msgstr "Doriţi să opriţi demonul tdm?"
 #: ../tdm.templates:3001
 #, fuzzy
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea "
+"Demonul Trinity Desktop manager (tdm) este oprit de obicei la actualizarea "
 "pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X "
 "de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o "
 "administrează va fi oprită. O alternativă ar fi să lăsaţi tdm să ruleze, iar "
@@ -94,7 +94,7 @@ msgid ""
 "Otherwise, the new version will take effect the next time the daemon is "
 "restarted."
 msgstr ""
-"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea "
+"Demonul Trinity Desktop manager (tdm) este oprit de obicei la actualizarea "
 "pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X "
 "de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o "
 "administrează va fi oprită. O alternativă ar fi să lăsaţi tdm să ruleze, iar "
diff --git a/debian/lenny/tdebase/debian/po/ru.po b/debian/lenny/tdebase/debian/po/ru.po
index 1bf9445de..e6c70d0e8 100644
--- a/debian/lenny/tdebase/debian/po/ru.po
+++ b/debian/lenny/tdebase/debian/po/ru.po
@@ -92,10 +92,10 @@ msgstr "Остановить сервер-демон tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Сервер-демон менеджера K Desktop (tdm) обычно останавливают при обновлении "
+"Сервер-демон менеджера Trinity Desktop (tdm) обычно останавливают при обновлении "
 "или удалении пакета, но, кажется, что tdm сейчас управляет по крайней мере "
 "одним X-сеансом."
 
diff --git a/debian/lenny/tdebase/debian/po/sk.po b/debian/lenny/tdebase/debian/po/sk.po
index 4c6241e4a..7eed2c613 100644
--- a/debian/lenny/tdebase/debian/po/sk.po
+++ b/debian/lenny/tdebase/debian/po/sk.po
@@ -70,10 +70,10 @@ msgstr "Zastaviť správcu obrazovky tdm?"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
-"Správca obrazovky K desktop manager (tdm) sa zvykne zastaviť pri "
+"Správca obrazovky Trinity desktop manager (tdm) sa zvykne zastaviť pri "
 "aktualizácii alebo odstraňovaní balíka, lenže teraz to vyzerá tak, že má na "
 "starosti aspoň jedno ďalšie spustené X sedenie."
 
diff --git a/debian/lenny/tdebase/debian/po/sv.po b/debian/lenny/tdebase/debian/po/sv.po
index e83a6926a..f6295d08e 100644
--- a/debian/lenny/tdebase/debian/po/sv.po
+++ b/debian/lenny/tdebase/debian/po/sv.po
@@ -72,8 +72,8 @@ msgstr "Stoppa tdm-demonen?"
 #. Type: boolean
 #. Description
 #: ../tdm.templates:3001
-msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
-msgstr "K Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar åtminstone en körande X-session."
+msgid "The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
+msgstr "Trinity Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar åtminstone en körande X-session."
 
 #. Type: boolean
 #. Description
@@ -112,13 +112,13 @@ msgstr "Om tdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. O
 #~ msgid "Do you wish to stop the tdm daemon?"
 #~ msgstr "Vill du stoppa tdm-daemonen?"
 #~ msgid ""
-#~ "The K Desktop manager (tdm) daemon is typically stopped on package "
+#~ "The Trinity Desktop manager (tdm) daemon is typically stopped on package "
 #~ "upgrade and removal, but it appears to be managing at least one running X "
 #~ "session. If tdm is stopped now, any X sessions it manages will be "
 #~ "terminated. Otherwise you may leave tdm running, and the new version will "
 #~ "take effect the next time the daemon is restarted."
 #~ msgstr ""
-#~ "Daemonen (tdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering "
+#~ "Daemonen (tdm) för skrivbordsmiljön TDE stoppas normalt vid uppgradering "
 #~ "och avinstallation av paketet men det verkar som om den hanterar "
 #~ "åtminstone en körande X-session. Om tdm stoppas nu kommer de X-sessioner "
 #~ "den hanterar att avslutas. Annars kan du lämna tdm körande och den nya "
diff --git a/debian/lenny/tdebase/debian/po/ta.po b/debian/lenny/tdebase/debian/po/ta.po
index eb68492d6..757adef2d 100644
--- a/debian/lenny/tdebase/debian/po/ta.po
+++ b/debian/lenny/tdebase/debian/po/ta.po
@@ -67,7 +67,7 @@ msgstr "கேடிஎம் கிங்கரனை (tdm daemon) நிறு
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "கே மேல்மேசை மேலாளர் (கேடிஎம்) கிங்கரன் வழக்கமாக பொதி மேலாக்கம் அல்லது நீக்கம் நிகழும் போது நிறுத்தப் படும். "
diff --git a/debian/lenny/tdebase/debian/po/templates.pot b/debian/lenny/tdebase/debian/po/templates.pot
index 42689d3b2..29e505209 100644
--- a/debian/lenny/tdebase/debian/po/templates.pot
+++ b/debian/lenny/tdebase/debian/po/templates.pot
@@ -59,7 +59,7 @@ msgstr ""
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 
diff --git a/debian/lenny/tdebase/debian/po/tr.po b/debian/lenny/tdebase/debian/po/tr.po
index 189791bc4..f6bd6cd2b 100644
--- a/debian/lenny/tdebase/debian/po/tr.po
+++ b/debian/lenny/tdebase/debian/po/tr.po
@@ -70,7 +70,7 @@ msgstr "tdm servisini durdurmak istiyor musunuz?"
 #: ../tdm.templates:3001
 #, fuzzy
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında "
diff --git a/debian/lenny/tdebase/debian/po/vi.po b/debian/lenny/tdebase/debian/po/vi.po
index 778d8ca82..27100c9b8 100644
--- a/debian/lenny/tdebase/debian/po/vi.po
+++ b/debian/lenny/tdebase/debian/po/vi.po
@@ -59,7 +59,7 @@ msgstr "Thôi trình nền tdm không?"
 #.Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr "Trình nền quản lý màn hình nền K (tdm) thường bị thôi khi nâng cấp/gỡ bỏ gói, nhưng hiện thời có vẻ là nó quản lý ít nhất một phiên chạy X đang hoạt động."
 
diff --git a/debian/lenny/tdebase/debian/po/zh_CN.po b/debian/lenny/tdebase/debian/po/zh_CN.po
index 89c59509d..489335022 100644
--- a/debian/lenny/tdebase/debian/po/zh_CN.po
+++ b/debian/lenny/tdebase/debian/po/zh_CN.po
@@ -82,7 +82,7 @@ msgstr "停止 tdm 守护进程吗？"
 #. Description
 #: ../tdm.templates:3001
 msgid ""
-"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
+"The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade "
 "and removal, but it appears to be managing at least one running X session."
 msgstr ""
 "K 桌面管理器 (tdm) 守护进程通常会在软件包升级和卸载时被停止，但看起来它目前在"
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kate b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kate
index 20d6092ad..6f137f5bd 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kate
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kate
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-kate
 Title: Kate Handbook
 Author: Anders Lund, Seth Rothberg, Dominik Haumann
-Abstract: Kate is a programmer's text editor for KDE.
+Abstract: Kate is a programmer's text editor for TDE.
 Section: Apps/Text
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kfind b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kfind
index c377acfcf..9db8293c7 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kfind
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kfind
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-kfind
 Title: KFind Handbook
 Author: Dirk Doerflinger
-Abstract: This Handbook describes KFind, KDE's file find utility.
+Abstract: This Handbook describes KFind, TDE's file find utility.
 Section: Apps/Utils
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kicker b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kicker
index d5f032b13..1d6269440 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kicker
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kicker
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-kicker
 Title: Kicker Handbook
 Author: Orville Bennett, Dirk Doerflinger
-Abstract: Kicker is the KDE application starter panel and is also capable of
+Abstract: Kicker is the TDE application starter panel and is also capable of
  some useful applets and extensions.
 Section: Apps/Utils
 
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.klipper b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.klipper
index 80d62407b..cbfb08f2d 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.klipper
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.klipper
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-klipper
 Title: Klipper Handbook
 Author: Philip.Rodrigues
-Abstract: Klipper is the KDE clipboard cut and paste utility.
+Abstract: Klipper is the TDE clipboard cut and paste utility.
 Section: Apps/Utils
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
index 7e7f914fe..ff6a0b3fc 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-kmenuedit
 Title: KMenuEdit Handbook
 Author: Milos Prudek, Lauri Watts
-Abstract: KMenuEdit allows the editing of the KDE main menu.
+Abstract: KMenuEdit allows the editing of the TDE main menu.
 Section: Apps/System
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konqueror b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konqueror
index 9b2d006b1..785e9ba10 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konqueror
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konqueror
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-konqueror
 Title: Konqueror Handbook
 Author: Pamela Roberts
-Abstract: Konqueror is KDE's advanced File Manager, Web Browser and
+Abstract: Konqueror is TDE's advanced File Manager, Web Browser and
  Universal Viewing Application.
 Section: Apps/Tools
 
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konsole b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konsole
index 766fee9cf..a91c7d786 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konsole
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.konsole
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-konsole
 Title: Konsole Handbook
 Author: Jonathan Singer, Kurt Hindenburg
-Abstract: Konsole is an X terminal emulator for KDE.
+Abstract: Konsole is an X terminal emulator for TDE.
 Section: Xshells 
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
index 4ce4ca6ec..78183cf11 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-tdeprint
-Title: KDEPrint Handbook
+Title: TDEPrint Handbook
 Author: Kurt Pfeifle
-Abstract: KDEPrint is the official printing system of KDE. 
+Abstract: TDEPrint is the official printing system of TDE. 
 Section: Apps/Tools 
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdm b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdm
index 9ee99f8b4..65baf3a32 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdm
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdm
@@ -1,7 +1,7 @@
 Document: tdebase-doc-html-tdm
 Title: TDM Handbook
 Author: Oswald Buddenhagen 
-Abstract: This document describes TDM, the KDE Display Manager, an X session manager.
+Abstract: This document describes TDM, the Trinity Display Manager, an X session manager.
 Section: System 
 
 Format: HTML
diff --git a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 37f0e0986..9af35d9f9 100644
--- a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
+++ b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
@@ -1,7 +1,7 @@
-KDE and media tdeioslave support
+TDE and media tdeioslave support
 ==============================
 
-The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new from KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 cameras, and many other types of equipment.
 
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
index 920f59acd..f3de6d0af 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
@@ -1,11 +1,11 @@
-?package(tdebase-bin):\
+?package(tdebase-trinity-bin):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
 	title="TDEDebugDialog"\
 	command="/opt/trinity/bin/tdedebugdialog"
 
-?package(tdebase-bin):\
+?package(tdebase-trinity-bin):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-dev.install b/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
index 311603e9d..1d4b759ad 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
@@ -1,42 +1,42 @@
-debian/tmp/opt/trinity/include//kate/application.h
-debian/tmp/opt/trinity/include//kate/documentmanager.h
-debian/tmp/opt/trinity/include//kate/mainwindow.h
-debian/tmp/opt/trinity/include//kate/pluginconfiginterfaceextension.h
-debian/tmp/opt/trinity/include//kate/pluginconfiginterface.h
-debian/tmp/opt/trinity/include//kate/plugin.h
-debian/tmp/opt/trinity/include//kate/pluginmanager.h
-debian/tmp/opt/trinity/include//kate/toolviewmanager.h
-debian/tmp/opt/trinity/include//kate/utils/dockviewbase.h
-debian/tmp/opt/trinity/include//kate/utils/listboxview.h
-debian/tmp/opt/trinity/include//kate/utils/messageview.h
-debian/tmp/opt/trinity/include//kate/viewmanager.h
-debian/tmp/opt/trinity/include//KBackgroundIface.h
-debian/tmp/opt/trinity/include//kcommondecoration.h
-debian/tmp/opt/trinity/include//kdecorationfactory.h
-debian/tmp/opt/trinity/include//kdecoration.h
-debian/tmp/opt/trinity/include//kdecoration_p.h
-debian/tmp/opt/trinity/include//kdecoration_plugins_p.h
-debian/tmp/opt/trinity/include//KDesktopIface.h
-debian/tmp/opt/trinity/include//kgreeterplugin.h
-debian/tmp/opt/trinity/include//konqsidebarplugin.h
-debian/tmp/opt/trinity/include//KonquerorIface.h
-debian/tmp/opt/trinity/include//KScreensaverIface.h
-debian/tmp/opt/trinity/include//ksgrd/HostConnector.h
-debian/tmp/opt/trinity/include//ksgrd/SensorAgent.h
-debian/tmp/opt/trinity/include//ksgrd/SensorClient.h
-debian/tmp/opt/trinity/include//ksgrd/SensorManager.h
-debian/tmp/opt/trinity/include//ksgrd/SensorShellAgent.h
-debian/tmp/opt/trinity/include//ksgrd/SensorSocketAgent.h
-debian/tmp/opt/trinity/include//ksgrd/StyleEngine.h
-debian/tmp/opt/trinity/include//ksgrd/StyleSettings.h
-debian/tmp/opt/trinity/include//ksgrd/TimerSettings.h
-debian/tmp/opt/trinity/include//ksplash/objkstheme.h
-debian/tmp/opt/trinity/include//ksplash/themeengine.h
-debian/tmp/opt/trinity/include//twin/client.h
-debian/tmp/opt/trinity/include//KWinInterface.h
-debian/tmp/opt/trinity/include//twin/twinbutton.h
-debian/tmp/opt/trinity/include//twin/options.h
-debian/tmp/opt/trinity/include//twin/workspace.h
+debian/tmp/opt/trinity/include/kate/application.h
+debian/tmp/opt/trinity/include/kate/documentmanager.h
+debian/tmp/opt/trinity/include/kate/mainwindow.h
+debian/tmp/opt/trinity/include/kate/pluginconfiginterfaceextension.h
+debian/tmp/opt/trinity/include/kate/pluginconfiginterface.h
+debian/tmp/opt/trinity/include/kate/plugin.h
+debian/tmp/opt/trinity/include/kate/pluginmanager.h
+debian/tmp/opt/trinity/include/kate/toolviewmanager.h
+debian/tmp/opt/trinity/include/kate/utils/dockviewbase.h
+debian/tmp/opt/trinity/include/kate/utils/listboxview.h
+debian/tmp/opt/trinity/include/kate/utils/messageview.h
+debian/tmp/opt/trinity/include/kate/viewmanager.h
+debian/tmp/opt/trinity/include/KBackgroundIface.h
+debian/tmp/opt/trinity/include/kcommondecoration.h
+debian/tmp/opt/trinity/include/kdecorationfactory.h
+debian/tmp/opt/trinity/include/kdecoration.h
+debian/tmp/opt/trinity/include/kdecoration_p.h
+debian/tmp/opt/trinity/include/kdecoration_plugins_p.h
+debian/tmp/opt/trinity/include/KDesktopIface.h
+debian/tmp/opt/trinity/include/kgreeterplugin.h
+debian/tmp/opt/trinity/include/konqsidebarplugin.h
+debian/tmp/opt/trinity/include/KonquerorIface.h
+debian/tmp/opt/trinity/include/KScreensaverIface.h
+debian/tmp/opt/trinity/include/ksgrd/HostConnector.h
+debian/tmp/opt/trinity/include/ksgrd/SensorAgent.h
+debian/tmp/opt/trinity/include/ksgrd/SensorClient.h
+debian/tmp/opt/trinity/include/ksgrd/SensorManager.h
+debian/tmp/opt/trinity/include/ksgrd/SensorShellAgent.h
+debian/tmp/opt/trinity/include/ksgrd/SensorSocketAgent.h
+debian/tmp/opt/trinity/include/ksgrd/StyleEngine.h
+debian/tmp/opt/trinity/include/ksgrd/StyleSettings.h
+debian/tmp/opt/trinity/include/ksgrd/TimerSettings.h
+debian/tmp/opt/trinity/include/ksplash/objkstheme.h
+debian/tmp/opt/trinity/include/ksplash/themeengine.h
+debian/tmp/opt/trinity/include/twin/client.h
+debian/tmp/opt/trinity/include/KWinInterface.h
+debian/tmp/opt/trinity/include/twin/twinbutton.h
+debian/tmp/opt/trinity/include/twin/options.h
+debian/tmp/opt/trinity/include/twin/workspace.h
 debian/tmp/opt/trinity/lib/libkasbar.la
 debian/tmp/opt/trinity/lib/libkasbar.so
 debian/tmp/opt/trinity/lib/libkateinterfaces.la
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian b/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
index 9944d8af8..2d03bb326 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
+++ b/debian/lenny/tdebase/debian/tdebase-trinity.README.Debian
@@ -4,10 +4,10 @@ Kdm
 For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian
 
 
-KDE and media tdeioslave support
+TDE and media tdeioslave support
 ==============================
 
-The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new from KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 cameras, and many other types of equipment.
 
@@ -40,16 +40,16 @@ thing.
 Installing konsole's bitmap fonts
 =================================
 
-Formerly, the few bitmap fonts KDE included, designed for use with Konsole,
+Formerly, the few bitmap fonts TDE included, designed for use with Konsole,
 were shipped as part of the xfonts-konsole package. However, as Konsole no
 longer uses these fonts by default, and most users no longer use bitmap
-fonts at all, KDE now includes these fonts with Konsole itself, and Debian
+fonts at all, TDE now includes these fonts with Konsole itself, and Debian
 has followed this practice, including the fonts in the konsole package, and
 eliminating the xfonts-konsole package entirely.
 
 To make use of these legacy fonts, start Konsole, and under Settings --> Font
 select "Install Bitmap...". This will allow you to copy the legacy Konsole
-fonts to $HOME/.fonts, where, after restarting KDE, all applications run by
+fonts to $HOME/.fonts, where, after restarting TDE, all applications run by
 that user, including Konsole, will be able to find them. Also make sure that
 fontconfig is configured to allow the use of bitmap fonts. If you're not sure,
 run, as root, 'dpkg-reconfigure fontconfig' from Konsole.
diff --git a/debian/lenny/tdebase/debian/tdepasswd-trinity.menu b/debian/lenny/tdebase/debian/tdepasswd-trinity.menu
index b448a0860..9177ab1d8 100644
--- a/debian/lenny/tdebase/debian/tdepasswd-trinity.menu
+++ b/debian/lenny/tdebase/debian/tdepasswd-trinity.menu
@@ -1,4 +1,4 @@
-?package(tdepasswd):\
+?package(tdepasswd-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
index 44d628ae7..4da234790 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
@@ -1,4 +1,4 @@
-?package(tdeprint):\
+?package(tdeprint-trinity):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
 	command="/opt/trinity/bin/kjobviewer --show --all"
 
-?package(tdeprint):\
+?package(tdeprint-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
@@ -16,7 +16,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
 	command="/opt/trinity/bin/kprinter"
 
-?package(tdeprint):\
+?package(tdeprint-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.init b/debian/lenny/tdebase/debian/tdm-trinity.init
index 790291f5a..5654e186d 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.init
+++ b/debian/lenny/tdebase/debian/tdm-trinity.init
@@ -13,7 +13,7 @@
 # /etc/init.d/tdm-trinity: start or stop the X display manager
 # Script originally stolen from the xdm package
 #
-# description: TDE Display Manager
+# description: Trinity Display Manager
 #
 
 . /lib/lsb/init-functions
@@ -113,15 +113,15 @@ case "$1" in
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      log_warning_msg "Not starting TDE Display Manager (tdm-trinity); it is not the default display manager."
+      log_warning_msg "Not starting Trinity Display Manager (tdm-trinity); it is not the default display manager."
       log_action_end_msg 0
     else
-      log_action_begin_msg "Starting TDE Display Manager: tdm-trinity"
+      log_action_begin_msg "Starting Trinity Display Manager: tdm-trinity"
       if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG; then
         log_action_end_msg 0
       else
         log_action_end_msg 0
-        log_warning_msg "TDE Display Manager tdm-trinity already running"
+        log_warning_msg "Trinity Display Manager tdm-trinity already running"
       fi
     fi
   ;;
@@ -137,7 +137,7 @@ case "$1" in
   ;;
 
   reload)
-    log_action_begin_msg "Reloading TDE Display Manager configuration..."
+    log_action_begin_msg "Reloading Trinity Display Manager configuration..."
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
       log_action_end_msg 0
     else
@@ -151,10 +151,10 @@ case "$1" in
   ;;
 
   stop)
-    log_action_begin_msg "Stopping TDE Display Manager: tdm-trinity"
+    log_action_begin_msg "Stopping Trinity Display Manager: tdm-trinity"
     if [ ! -f $PIDFILE ]; then
       log_action_end_msg 0
-      log_failure_msg "TDE Display Manager tdm-trinity not running ($PIDFILE not found)."
+      log_failure_msg "Trinity Display Manager tdm-trinity not running ($PIDFILE not found)."
       exit 0
     else
       DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]')
@@ -165,7 +165,7 @@ case "$1" in
           sleep 1
         else
           log_action_end_msg 0
-          log_failure_msg "TDE Display Manager tdm-trinity not running"
+          log_failure_msg "Trinity Display Manager tdm-trinity not running"
         fi
       fi
       while [ $KILLCOUNT -le 5 ]; do
@@ -179,7 +179,7 @@ case "$1" in
       done
       if stillrunning; then
         log_action_end_msg 1
-        log_failure_msg "TDE Display Manager tdm-trinity not responding to TERM signal (pid $DAEMONPID)"
+        log_failure_msg "Trinity Display Manager tdm-trinity not responding to TERM signal (pid $DAEMONPID)"
       else
         rm -f $UPGRADEFILE
       fi
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.postinst b/debian/lenny/tdebase/debian/tdm-trinity.postinst
index 1fd604c2a..fa0266639 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.postinst
+++ b/debian/lenny/tdebase/debian/tdm-trinity.postinst
@@ -89,7 +89,7 @@ if [ -e /etc/trinity/tdm/Xservers ]; then
   fi
 fi
 
-# With KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if
+# From KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if
 # the user has updated their tdmrc (if they haven't, tdm notices and keeps using
 # Xservers), and if it wasn't touched, i.e. there are no local changes the user
 # will want to merge into tdmrc.
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.templates b/debian/lenny/tdebase/debian/tdm-trinity.templates
index 564181f78..ac4f2df43 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.templates
+++ b/debian/lenny/tdebase/debian/tdm-trinity.templates
@@ -24,7 +24,7 @@ Template: tdm-trinity/stop_running_server_with_children
 Type: boolean
 Default: false
 _Description: Stop the tdm-trinity daemon?
- The K Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade
+ The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade
  and removal, but it appears to be managing at least one running X session.
  .
  If tdm is stopped now, any X sessions it manages will be terminated.