From c7bb5f0b917b82aed4203df3be0585be82077d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 27 May 2014 01:39:46 +0200
Subject: Branding cleanup on Debian and Ubuntu

---
 ubuntu/maverick/tdesdk/debian/cdbs/versions.pl     |   8 +-
 .../tdesdk/debian/cervisia-trinity.README.Debian   |   2 +-
 .../maverick/tdesdk/debian/cervisia-trinity.menu   |   2 +-
 ubuntu/maverick/tdesdk/debian/control              | 140 ++++++++---------
 ubuntu/maverick/tdesdk/debian/control.in           | 170 ++++++++++-----------
 .../tdesdk/debian/desktop-i18n/createdesktop.pl    |   4 +-
 .../maverick/tdesdk/debian/desktop-i18n/findfiles  |   4 +-
 .../maverick/tdesdk/debian/desktop-i18n/msgsplit   |   2 +-
 .../tdesdk/debian/kbabel-trinity.README.Debian     |   2 +-
 ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu  |   6 +-
 .../maverick/tdesdk/debian/kbugbuster-trinity.menu |   2 +-
 ubuntu/maverick/tdesdk/debian/kompare-trinity.menu |   2 +-
 .../maverick/tdesdk/debian/kuiviewer-trinity.menu  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/adddebug.1       |   2 +-
 .../maverick/tdesdk/debian/man/build-progress.sh.1 |  14 +-
 ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 |   6 +-
 ubuntu/maverick/tdesdk/debian/man/cheatmake.1      |   2 +-
 .../maverick/tdesdk/debian/man/create_cvsignore.1  |   2 +-
 .../maverick/tdesdk/debian/man/create_makefile.1   |   2 +-
 .../maverick/tdesdk/debian/man/create_makefiles.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvs-clean.1      |   4 +-
 ubuntu/maverick/tdesdk/debian/man/cvs2dist.1       |   6 +-
 ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1     |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvsbackport.1    |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvscheck.1       |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvslastchange.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvslastlog.1     |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/cvsservice.1     |   4 +-
 ubuntu/maverick/tdesdk/debian/man/cxxmetric.1      |   2 +-
 ubuntu/maverick/tdesdk/debian/man/demangle.1       |   2 +-
 ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/extractattr.1    |   2 +-
 ubuntu/maverick/tdesdk/debian/man/extractrc.1      |   2 +-
 .../tdesdk/debian/man/findmissingcrystal.1         |  12 +-
 ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1 |  12 +-
 ubuntu/maverick/tdesdk/debian/man/fixuifiles.1     |   6 +-
 .../maverick/tdesdk/debian/man/hotshot2calltree.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/kapptemplate.1   |  10 +-
 ubuntu/maverick/tdesdk/debian/man/kbabel.1         |   8 +-
 ubuntu/maverick/tdesdk/debian/man/kbabeldict.1     |   6 +-
 ubuntu/maverick/tdesdk/debian/man/kbugbuster.1     |   6 +-
 ubuntu/maverick/tdesdk/debian/man/kdedoc.1         |   8 +-
 .../maverick/tdesdk/debian/man/kdelnk2desktop.py.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1   |  12 +-
 ubuntu/maverick/tdesdk/debian/man/kminspector.1    |   6 +-
 ubuntu/maverick/tdesdk/debian/man/kmmatch.1        |   4 +-
 ubuntu/maverick/tdesdk/debian/man/kmtrace.1        |   6 +-
 ubuntu/maverick/tdesdk/debian/man/kompare.1        |   4 +-
 ubuntu/maverick/tdesdk/debian/man/kuiviewer.1      |   2 +-
 ubuntu/maverick/tdesdk/debian/man/licensecheck.1   |   2 +-
 ubuntu/maverick/tdesdk/debian/man/makeobj.1        |   6 +-
 .../maverick/tdesdk/debian/man/memprof2calltree.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/op2calltree.1    |   2 +-
 .../tdesdk/debian/man/package_crystalsvg.1         |   8 +-
 ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1     |   2 +-
 ubuntu/maverick/tdesdk/debian/man/po2xml.1         |   2 +-
 ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1 |   2 +-
 ubuntu/maverick/tdesdk/debian/man/qtdoc.1          |   2 +-
 ubuntu/maverick/tdesdk/debian/man/split2po.1       |   6 +-
 ubuntu/maverick/tdesdk/debian/man/swappo.1         |   2 +-
 ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1  |   6 +-
 ubuntu/maverick/tdesdk/debian/man/tdekillall.1     |   2 +-
 ubuntu/maverick/tdesdk/debian/man/testkspy.1       |   4 +-
 ubuntu/maverick/tdesdk/debian/man/transxx.1        |   2 +-
 ubuntu/maverick/tdesdk/debian/man/umbrello.1       |   8 +-
 ubuntu/maverick/tdesdk/debian/man/xml2pot.1        |   2 +-
 ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1 |   2 +-
 .../debian/tdecachegrind-trinity.README.Debian     |   2 +-
 .../tdesdk/debian/tdecachegrind-trinity.menu       |   2 +-
 .../debian/tdesdk-doc-html.doc-base.tdecachegrind  |   2 +-
 .../debian/tdesdk-misc-trinity.README.Debian       |   4 +-
 .../debian/tdesdk-scripts-trinity.README.Debian    |   6 +-
 .../tdesdk/debian/tdesdk-trinity.README.Debian     |   6 +-
 .../tdesdk/debian/umbrello-trinity.README.Debian   |   2 +-
 .../maverick/tdesdk/debian/umbrello-trinity.menu   |   2 +-
 79 files changed, 306 insertions(+), 306 deletions(-)

(limited to 'ubuntu/maverick/tdesdk')

diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl b/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdesdk/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/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
index 522b2eb7f..d3b879f59 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
@@ -1,7 +1,7 @@
 Cervisia for Debian
 -------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdesdk-doc-html.
 
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
index d19784c16..f418eb305 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
@@ -1,4 +1,4 @@
-?package(cervisia):\
+?package(cervisia-trinity):\
   needs="x11"\
   section="Applications/Programming"\
   hints="TDE,Version control"\
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 6d342046e..654074e7b 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -20,13 +20,13 @@ Breaks: kdesdk-kde3 (<< 4:14.0.0~), kdesdk-trinity (<< 4:14.0.0~)
 Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-tdefile-plugins-trinity (>= ${Source-Version}), tdesdk-tdeio-plugins-trinity (>= ${Source-Version}) | tdesvn-tdeio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+ 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 Trinity Software Development Kit, a collection
- of applications and tools useful for developing KDE applications.
+ of applications and tools useful for developing TDE applications.
 
 Package: tdesdk-trinity-doc-html
 Architecture: all
@@ -35,18 +35,18 @@ Replaces: kdesdk-kde3-doc-html (<< 4:14.0.0~), kdesdk-trinity-doc-html (<< 4:14.
 Breaks: kdesdk-kde3-doc-html (<< 4:14.0.0~), kdesdk-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdesdk-trinity
 Description: Trinity Software Development Kit 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 SDK documentation converted to
+ 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 SDK documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/umbrello/. Documentation is provided for most
- KDE SDK packages.
+ TDE SDK packages.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: cervisia-trinity
 Architecture: any
@@ -56,7 +56,7 @@ Breaks: cervisia-kde3 (<< 4:14.0.0~), cervisia-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: a graphical CVS front end for Trinity
- Cervisia is a KDE-based graphical front end for the CVS client.
+ Cervisia is a TDE-based graphical front end for the CVS client.
  .
  As well as providing both common and advanced CVS operations, it offers
  a variety of methods for graphically viewing information about the CVS
@@ -64,8 +64,8 @@ Description: a graphical CVS front end for Trinity
  versions of files.  A Changelog editor is also included and is coupled
  with the commit dialog.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kapptemplate-trinity
 Architecture: all
@@ -75,12 +75,12 @@ Breaks: kapptemplate-kde3 (<< 4:14.0.0~), kapptemplate-trinity (<< 4:14.0.0~)
 Recommends: automake1.9 | automaken, tdelibs14-trinity-dev
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
- framework to develop various KDE applications.  It takes care of the
+ framework to develop various TDE applications.  It takes care of the
  autoconf/automake code as well as providing a skeleton and example of
  what the code typically looks like.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity
 Architecture: any
@@ -101,8 +101,8 @@ Description: PO-file editing suite for Trinity
  PO-files at once.  KBabelDict is a dictionary to assist with searching
  for common translations.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity-dev
 Architecture: any
@@ -123,8 +123,8 @@ Description: PO-file editing suite for Trinity (development files)
  .
  This package contains the KBabel development files.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbugbuster-trinity
 Architecture: any
@@ -134,12 +134,12 @@ Breaks: kbugbuster-kde3 (<< 4:14.0.0~), kbugbuster-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: a front end for the Trinity bug tracking system
- KBugBuster is a GUI front end for the KDE bug tracking system.
+ KBugBuster is a GUI front end for the TDE bug tracking system.
  It allows the user to view and manipulate bug reports and provides a
  variety of options for searching through reports.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdecachegrind-trinity
 Architecture: any
@@ -158,8 +158,8 @@ Description: visualisation tool for valgrind profiling output
  For visualising the output from other profiling tools, several converters
  can be found in the tdecachegrind-converters package.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdecachegrind-converters-trinity
 Architecture: all
@@ -177,8 +177,8 @@ Description: format converters for TDECachegrind profiling visualisation tool
  profiled using calltree without being recompiled, and shared libraries
  and plugin architectures are supported.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdesdk-tdefile-plugins-trinity
 Architecture: any
@@ -187,12 +187,12 @@ Replaces: kdesdk-kfile-plugins-kde3 (<< 4:14.0.0~), kdesdk-kfile-plugins-trinity
 Breaks: kdesdk-kfile-plugins-kde3 (<< 4:14.0.0~), kdesdk-kfile-plugins-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: Trinity file dialog plugins for software development files
- This is a collection of plugins for the KDE file dialog.  These plugins
+ This is a collection of plugins for the TDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdesdk-misc-trinity
 Architecture: any
@@ -204,16 +204,16 @@ Recommends: libtqt3-mt-dev | libtqt3-dev
 Suggests: gimp | xpaint
 Description: various goodies from the Trinity Software Development Kit
  This package contains miscellaneous goodies provided with the official
- KDE release to assist with KDE software development.
+ TDE release to assist with TDE software development.
  .
  Included are:
-  - headers to assist with profiling KDE code;
-  - a widget style for checking conformity with the KDE/Qt style guide;
-  - palettes that match the KDE standard colour palette;
-  - a KDE address book plugin that reads the list of KDE CVS accounts.
+  - headers to assist with profiling TDE code;
+  - a widget style for checking conformity with the TDE/TQt style guide;
+  - palettes that match the TDE standard colour palette;
+  - a TDE address book plugin that reads the list of TDE CVS accounts.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdesdk-scripts-trinity
 Architecture: all
@@ -226,18 +226,18 @@ Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-
 Enhances: kate-trinity
 Description: a set of useful development scripts for Trinity
  This package contains a number of scripts which can be used to help in
- developing KDE-based applications.  Many of these scripts however are
- not specific to KDE, and in particular there are several general-use
+ developing TDE-based applications.  Many of these scripts however are
+ not specific to TDE, and in particular there are several general-use
  scripts to help users in working with SVN and CVS repositories.
  .
  In addition to these scripts, this package provides:
-  - gdb macros for Qt/KDE programming;
-  - vim and emacs helper files for Qt/KDE programming;
-  - bash and zsh completion controls for KDE apps;
-  - valgrind error suppressions for KDE apps.
+  - gdb macros for TQt/TDE programming;
+  - vim and emacs helper files for TQt/TDE programming;
+  - bash and zsh completion controls for TDE apps;
+  - valgrind error suppressions for TDE apps.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kmtrace-trinity
 Architecture: any
@@ -246,11 +246,11 @@ Replaces: kmtrace-kde3 (<< 4:14.0.0~), kmtrace-trinity (<< 4:14.0.0~)
 Breaks: kmtrace-kde3 (<< 4:14.0.0~), kmtrace-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, less
 Description: a Trinity memory leak tracer
- KMtrace is a KDE tool to assist with malloc debugging using glibc's
+ KMtrace is a TDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kompare-trinity
 Architecture: any
@@ -264,8 +264,8 @@ Description: a Trinity GUI for viewing differences between files
  files.  It can compare two documents, create a diff file, display a diff
  file and/or blend a diff file back into the original documents.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kspy-trinity
 Architecture: any
@@ -273,9 +273,9 @@ Section: devel
 Replaces: kspy-kde3 (<< 4:14.0.0~), kspy-trinity (<< 4:14.0.0~)
 Breaks: kspy-kde3 (<< 4:14.0.0~), kspy-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tdelibs14-trinity-dev
-Description: examines the internal state of a Qt/KDE app
+Description: examines the internal state of a TQt/TDE app
  KSpy is a tiny library which can be used to graphically display
- the QObjects in use by a Qt/KDE app.  In addition to the object tree,
+ the QObjects in use by a TQt/TDE app.  In addition to the object tree,
  you can also view the properties, signals and slots of any QObject.
  .
  Basically it provides much the same info as QObject::dumpObjectTree() and
@@ -285,8 +285,8 @@ Description: examines the internal state of a Qt/KDE app
  .
  See /usr/share/doc/kspy/README for usage instructions.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kuiviewer-trinity
 Architecture: any
@@ -302,8 +302,8 @@ Description: viewer for TQt Designer user interface files
  .
  The TQt Designer itself is in the package tqt3-designer.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice0-trinity
 Architecture: any
@@ -317,10 +317,10 @@ Description: DCOP service for accessing CVS repositories
  access the DCOP service directly from C++.  Alternatively, scripts may
  access the service using the standard "dcop" command-line tool.
  .
- DCOP is the Desktop Communication Protocol used throughout KDE.
+ DCOP is the Desktop Communication Protocol used throughout TDE.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice-trinity-dev
 Architecture: any
@@ -337,8 +337,8 @@ Description: development files for CVS DCOP service
  .
  Development files for libcvsservice are included in this package.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: poxml-trinity
 Architecture: any
@@ -353,8 +353,8 @@ Description: tools for using PO-files to translate DocBook XML files
  Also included are some miscellaneous command-line utilities for
  manipulating DocBook XML files, PO-files and PO-template files.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: umbrello-trinity
 Architecture: any
@@ -364,7 +364,7 @@ Breaks: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: UML modelling tool and code generator
- Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
+ Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
  With UML you can create diagrams of software and other systems in an
  industry standard format.  Umbrello can also generate code from your
  UML diagrams in a number of programming languages.
@@ -373,8 +373,8 @@ Description: UML modelling tool and code generator
  diagrams, use case diagrams, state diagrams, activity diagrams, component
  diagrams and deployment diagrams.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdesdk-tdeio-plugins-trinity
 Architecture: any
@@ -384,11 +384,11 @@ Breaks: kdesdk-kio-plugins-kde3 (<< 4:14.0.0~), kdesdk-kio-plugins-trinity (<< 4
 Depends: ${shlibs:Depends}, subversion
 Description: subversion ioslave for Trinity
  This package provides easy access to remote SVN repositories from within
- Konqueror, and KDE generally, by browsing them as if they were a
+ Konqueror, and TDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdeunittest-trinity
 Architecture: any
@@ -399,13 +399,13 @@ Depends: ${shlibs:Depends}
 Suggests: tdelibs14-trinity-doc
 Description: unit testing library for Trinity
  TDEUnitTest is a small library that facilitates the writing of tests for
- KDE developers. There are two ways to use the TDEUnitTest library. One is
+ TDE developers. There are two ways to use the TDEUnitTest library. One is
  to create dynamically loadable modules and use the tdeunittestmodrunner or
  tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
- This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE SDK module.
+ See the 'tde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: tdesdk-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 8185ba206..d1635989c 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -15,41 +15,41 @@ Architecture: all
 Section: tde
 Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-tdefile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
 Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html
-Description: software development kit from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: software development kit 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 KDE Software Development Kit, a collection
- of applications and tools useful for developing KDE applications.
+ This metapackage includes the TDE Software Development Kit, a collection
+ of applications and tools useful for developing TDE applications.
 
 Package: tdesdk-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdesdk
 Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0)
-Description: KDE Software Development Kit 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 SDK documentation converted to
+Description: TDE Software Development Kit 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 SDK documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/umbrello/. Documentation is provided for most
- KDE SDK packages.
+ TDE SDK packages.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: cervisia
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter, tdesdk-doc-html
-Description: a graphical CVS front end for KDE
- Cervisia is a KDE-based graphical front end for the CVS client.
+Description: a graphical CVS front end for TDE
+ Cervisia is a TDE-based graphical front end for the CVS client.
  .
  As well as providing both common and advanced CVS operations, it offers
  a variety of methods for graphically viewing information about the CVS
@@ -57,21 +57,21 @@ Description: a graphical CVS front end for KDE
  versions of files.  A Changelog editor is also included and is coupled
  with the commit dialog.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kapptemplate
 Architecture: all
 Section: devel
 Recommends: automake1.9 | automaken, tdelibs4-dev
-Description: creates a framework to develop a KDE application
+Description: creates a framework to develop a TDE application
  KAppTemplate is a shell script that will create the necessary
- framework to develop various KDE applications.  It takes care of the
+ framework to develop various TDE applications.  It takes care of the
  autoconf/automake code as well as providing a skeleton and example of
  what the code typically looks like.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kbabel
 Architecture: any
@@ -79,7 +79,7 @@ Section: devel
 Depends: ${shlibs:Depends}
 Recommends: gettext
 Suggests: khelpcenter, tdesdk-doc-html
-Description: PO-file editing suite for KDE
+Description: PO-file editing suite for TDE
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -90,15 +90,15 @@ Description: PO-file editing suite for KDE
  PO-files at once.  KBabelDict is a dictionary to assist with searching
  for common translations.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
 Depends: kbabel (= ${Source-Version}), tdelibs4-dev
 Replaces: kbabel (<< 4:3.0.8-0)
-Description: PO-file editing suite for KDE (development files)
+Description: PO-file editing suite for TDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -111,21 +111,21 @@ Description: PO-file editing suite for KDE (development files)
  .
  This package contains the KBabel development files.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kbugbuster
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: a front end for the KDE bug tracking system
- KBugBuster is a GUI front end for the KDE bug tracking system.
+Description: a front end for the TDE bug tracking system
+ KBugBuster is a GUI front end for the TDE bug tracking system.
  It allows the user to view and manipulate bug reports and provides a
  variety of options for searching through reports.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdecachegrind
 Architecture: any
@@ -142,8 +142,8 @@ Description: visualisation tool for valgrind profiling output
  For visualising the output from other profiling tools, several converters
  can be found in the tdecachegrind-converters package.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdecachegrind-converters
 Architecture: all
@@ -159,20 +159,20 @@ Description: format converters for KCachegrind profiling visualisation tool
  profiled using calltree without being recompiled, and shared libraries
  and plugin architectures are supported.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdesdk-tdefile-plugins
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
-Description: KDE file dialog plugins for software development files
- This is a collection of plugins for the KDE file dialog.  These plugins
+Description: TDE file dialog plugins for software development files
+ This is a collection of plugins for the TDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdesdk-misc
 Architecture: any
@@ -182,18 +182,18 @@ Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
 Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
 Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), tdevelop3-plugins (<= 4:3.2.0-3)
-Description: various goodies from the KDE Software Development Kit
+Description: various goodies from the TDE Software Development Kit
  This package contains miscellaneous goodies provided with the official
- KDE release to assist with KDE software development.
+ TDE release to assist with TDE software development.
  .
  Included are:
-  - headers to assist with profiling KDE code;
-  - a widget style for checking conformity with the KDE/Qt style guide;
-  - palettes that match the KDE standard colour palette;
-  - a KDE address book plugin that reads the list of KDE CVS accounts.
+  - headers to assist with profiling TDE code;
+  - a widget style for checking conformity with the TDE/TQt style guide;
+  - palettes that match the TDE standard colour palette;
+  - a TDE address book plugin that reads the list of TDE CVS accounts.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdesdk-scripts
 Architecture: all
@@ -203,52 +203,52 @@ Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter, tdesdk-doc-html, dmalloc, gdb, tdelibs4-doc, qt3-doc, valgrind, devscripts
 Enhances: kate
 Replaces: tdevelop (<< 1:1.4.0-3.2)
-Description: a set of useful development scripts for KDE
+Description: a set of useful development scripts for TDE
  This package contains a number of scripts which can be used to help in
- developing KDE-based applications.  Many of these scripts however are
- not specific to KDE, and in particular there are several general-use
+ developing TDE-based applications.  Many of these scripts however are
+ not specific to TDE, and in particular there are several general-use
  scripts to help users in working with SVN and CVS repositories.
  .
  In addition to these scripts, this package provides:
-  - gdb macros for Qt/KDE programming;
-  - vim and emacs helper files for Qt/KDE programming;
-  - bash and zsh completion controls for KDE apps;
-  - valgrind error suppressions for KDE apps.
+  - gdb macros for TQt/TDE programming;
+  - vim and emacs helper files for TQt/TDE programming;
+  - bash and zsh completion controls for TDE apps;
+  - valgrind error suppressions for TDE apps.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kmtrace
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, less
-Description: a KDE memory leak tracer
- KMtrace is a KDE tool to assist with malloc debugging using glibc's
+Description: a TDE memory leak tracer
+ KMtrace is a TDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kompare
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: a KDE GUI for viewing differences between files
+Description: a TDE GUI for viewing differences between files
  Kompare is a graphical user interface for viewing the differences between
  files.  It can compare two documents, create a diff file, display a diff
  file and/or blend a diff file back into the original documents.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kspy
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, tdelibs4-dev
-Description: examines the internal state of a Qt/KDE app
+Description: examines the internal state of a TQt/TDE app
  KSpy is a tiny library which can be used to graphically display
- the QObjects in use by a Qt/KDE app.  In addition to the object tree,
+ the QObjects in use by a TQt/TDE app.  In addition to the object tree,
  you can also view the properties, signals and slots of any QObject.
  .
  Basically it provides much the same info as QObject::dumpObjectTree() and
@@ -258,8 +258,8 @@ Description: examines the internal state of a Qt/KDE app
  .
  See /usr/share/doc/kspy/README for usage instructions.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: kuiviewer
 Architecture: any
@@ -273,8 +273,8 @@ Description: viewer for Qt Designer user interface files
  .
  The Qt Designer itself is in the package qt3-designer.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice0
 Architecture: any
@@ -287,10 +287,10 @@ Description: DCOP service for accessing CVS repositories
  access the DCOP service directly from C++.  Alternatively, scripts may
  access the service using the standard "dcop" command-line tool.
  .
- DCOP is the Desktop Communication Protocol used throughout KDE.
+ DCOP is the Desktop Communication Protocol used throughout TDE.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice-dev
 Architecture: any
@@ -306,8 +306,8 @@ Description: development files for CVS DCOP service
  .
  Development files for libcvsservice are included in this package.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: poxml
 Architecture: any
@@ -320,8 +320,8 @@ Description: tools for using PO-files to translate DocBook XML files
  Also included are some miscellaneous command-line utilities for
  manipulating DocBook XML files, PO-files and PO-template files.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: umbrello
 Architecture: any
@@ -331,7 +331,7 @@ Suggests: khelpcenter, tdesdk-doc-html
 Conflicts: umbrello-manual (<< 20040311)
 Replaces: umbrello-manual (<< 20040311)
 Description: UML modelling tool and code generator
- Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
+ Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
  With UML you can create diagrams of software and other systems in an
  industry standard format.  Umbrello can also generate code from your
  UML diagrams in a number of programming languages.
@@ -340,36 +340,36 @@ Description: UML modelling tool and code generator
  diagrams, use case diagrams, state diagrams, activity diagrams, component
  diagrams and deployment diagrams.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdesdk-kio-plugins
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, subversion
 Replaces: tdesdk-misc (<< 4:3.5.0)
-Description: subversion ioslave for KDE
+Description: subversion ioslave for TDE
  This package provides easy access to remote SVN repositories from within
- Konqueror, and KDE generally, by browsing them as if they were a
+ Konqueror, and TDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdeunittest
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Suggests: tdelibs4-doc
-Description: unit testing library for KDE
+Description: unit testing library for TDE
  KUnitTest is a small library that facilitates the writing of tests for
- KDE developers. There are two ways to use the KUnitTest library. One is
+ TDE developers. There are two ways to use the KUnitTest library. One is
  to create dynamically loadable modules and use the tdeunittestmodrunner or
  tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
- This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'tdesdk' packages for more information.
+ This package is part of TDE, and a component of the TDE SDK module.
+ See the 'tde' and 'tdesdk' packages for more information.
 
 Package: tdesdk-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
index 1e2ff4bdb..c71551dc5 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
@@ -30,11 +30,11 @@ sub prepare
     print "msgid \"\"\n";
     print "msgstr \"\"\n";
     print "\"Project-Id-Version: desktop files\\n\"\n";
-    print "\"Report-Msgid-Bugs-To: http://bugs.kde.org\\n\"\n";
+    print "\"Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\\n\"\n";
     print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
     print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
-    print "\"Language-Team: LANGUAGE <tde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
     print "\"MIME-Version: 1.0\\n\"\n";
     print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
     print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles b/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
index 62e5012c2..f59fe6bae 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
@@ -19,7 +19,7 @@ find $dir -name "index.theme" -print | grep -v debian >> $filelist
 find $dir -name "eventsrc" -print | grep -v debian >> $filelist
 find $dir -name "*.protocol" -print | grep -v debian >> $filelist
 
-### TEMPORARY START: we do not have KDE modules
+### TEMPORARY START: we do not have TDE modules
 if true; then
 find ./konqueror -name .svn -prune , -name "directory.*" -type f  2>/dev/null | grep -v debian >> $filelist
 find ./kdesktop -name .svn -prune , -name "directory.*" -type f 2>/dev/null | grep -v debian >> $filelist 
@@ -33,7 +33,7 @@ find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
 fi
-### TEMPORARY END: we do not have KDE modules
+### TEMPORARY END: we do not have TDE modules
 
 # Extract .directory files in template directories of KOffice
 find . -name .directory|fgrep templates >> $filelist
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit b/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit
index 98789a47f..41481d336 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit
@@ -10,7 +10,7 @@ wrap_before = ['<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<p>', '<br>', '<
 	       '<ol>', '<ul>', '<li>', '<table>', '<th>', '<tr>', '<td>', '<center>', 
 	       '<blockquote>', '<pre>', '<hr>', '<hr/>']
 
-### TODO: try to support any charset, not only UTF-8 (so that it can be used outside KDE)
+### TODO: try to support any charset, not only UTF-8 (so that it can be used outside TDE)
 
 def splitit( start, message, outfile ):
 	# print start+"\""+message+"\"" # DEBUG
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
index d54016dfa..b26892afd 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
@@ -1,7 +1,7 @@
 KBabel for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdesdk-doc-html.
 
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
index 844de065d..13ba6a859 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
@@ -1,4 +1,4 @@
-?package(kbabel):\
+?package(kbabel-trinity):\
         needs="x11"\
         section="Applications/Text"\
         hints="TDE,l10n"\
@@ -7,7 +7,7 @@
         icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
         command="/opt/trinity/bin/kbabel"
 
-?package(kbabel):\
+?package(kbabel-trinity):\
         needs="x11"\
         section="Applications/Text"\
         hints="TDE,l10n"\
@@ -16,7 +16,7 @@
         icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
         command="/opt/trinity/bin/kbabeldict"
 
-?package(kbabel):\
+?package(kbabel-trinity):\
         needs="x11"\
         section="Applications/Text"\
         hints="TDE,l10n"\
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
index e804977e4..b30b78d3e 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
@@ -1,4 +1,4 @@
-?package(kbugbuster):\
+?package(kbugbuster-trinity):\
         needs="x11"\
         section="Applications/Project Management"\
         hints="TDE"\
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu b/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
index 72c04f5fe..7d717cceb 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
@@ -1,4 +1,4 @@
-?package(kompare):\
+?package(kompare-trinity):\
         needs="x11"\
         section="Applications/Text"\
         hints="TDE"\
diff --git a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu b/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
index 01628115e..c918b3ed8 100644
--- a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuiviewer):\
+?package(kuiviewer-trinity):\
   needs="x11"\
   section="Applications/Programming"\
   hints="TDE"\
diff --git a/ubuntu/maverick/tdesdk/debian/man/adddebug.1 b/ubuntu/maverick/tdesdk/debian/man/adddebug.1
index b1380f6c9..d78dad43c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/adddebug.1
+++ b/ubuntu/maverick/tdesdk/debian/man/adddebug.1
@@ -26,7 +26,7 @@ adddebug \- modifies Makefile(s) to add debug info
 It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
 remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 .B \-k
diff --git a/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1 b/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1
index a5cfcc3ec..28c9d9016 100644
--- a/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1
+++ b/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1
@@ -20,31 +20,31 @@ build-progress.sh \- show kde-build progress in your konsole/xterm title bar
 .SH SYNOPSIS
 .B build-progress.sh
 .SH DESCRIPTION
-\fBbuild-progress.sh\fP can be used to watch the progress of a large KDE
+\fBbuild-progress.sh\fP can be used to watch the progress of a large TDE
 build in the title bar of your konsole or xterm.
 .PP
-The KDE build must be running elsewhere as a separate process, and it
+The TDE build must be running elsewhere as a separate process, and it
 must be done using
 .BR kde-build (1).
 .PP
 When you run build-progress.sh, it will sit in a permanent loop while
 kde-build runs.  The title bar of the konsole/xterm in which you ran
 build-progress.sh will be continually updated with the directory in
-which the KDE build is currently working.
+which the TDE build is currently working.
 .PP
-You must run build-progress.sh from the top-level directory of the KDE
+You must run build-progress.sh from the top-level directory of the TDE
 build tree.  This directory must contain a file named
 \fIkde-buildrc\fP (which is also used by kde-build).  This
 \fIkde-buildrc\fP must contain valid settings for
-\fIKDELOGDIR\fP and \fIKDESRCDIR\fP, or else build-progress.sh will
+\fITDELOGDIR\fP and \fITDESRCDIR\fP, or else build-progress.sh will
 fail to work.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH FILES
 .TP
 \fIkde-buildrc\fP
 This file must be contained in the current directory, which must be the
-root of the KDE build tree.  See
+root of the TDE build tree.  See
 .BR kde-build (1)
 for further information.
 .SH SEE ALSO
diff --git a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
index bf439f0e4..db8b17613 100644
--- a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
@@ -33,7 +33,7 @@ is a multi functional catalog manager which allows you to keep track of many
 PO-files at once.  KBabelDict is a dictionary to assist with searching
 for common translations.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the catalogmanager-specific options.
 For a full summary of options, run \fIcatalogmanager \-\-help\fP.
@@ -44,14 +44,14 @@ Load the configuration from the given file.
 .BR kbabel (1),
 .BR kbabeldict (1).
 .PP
-Full user documentation for KBabel is available through the KDE Help Centre.
+Full user documentation for KBabel is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kbabel/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kbabel/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1 b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
index dcb8768ab..098449a0b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
@@ -31,7 +31,7 @@ into skipping files that haven't changed in a meaningful way.  This can be
 used for instance when you change a comment in a file but none of the actual
 code.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 The different modes of operation are as follows.
 .TP
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1 b/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1
index a2ab70541..ce63f6f55 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1
@@ -32,7 +32,7 @@ repository.
 Note that you must have a \fIMakefile.am\fP in the current directory for
 this tool to work.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB-r\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
index 96c9523c0..e128f23e9 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
@@ -40,7 +40,7 @@ environment variables below), it will be assumed that the \fIMakefile.am\fP
 and \fIMakefile.in\fP belong beneath the source directory and that the
 \fIMakefile\fP belongs beneath the build directory.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH ENVIRONMENT VARIABLES
 One of the following variables (but not both) should be set if the
 source
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
index 5a9f57ade..2efc03795 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
@@ -34,7 +34,7 @@ environment variables below), it will be assumed that each \fIMakefile.am\fP
 and \fIMakefile.in\fP belongs beneath the source directory and that each
 \fIMakefile\fP belongs beneath the build directory.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH ENVIRONMENT VARIABLES
 One of the following variables (but not both) should be set if the
 source
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1 b/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1
index d025b000d..0706e485c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1
@@ -30,9 +30,9 @@ A list of all files and directories that are deleted will be written to
 the console.
 .PP
 This script behaves similarly to the \fIcvs-clean\fP target from the
-file \fIadmin/Makefile.common\fP found in most KDE application sources.
+file \fIadmin/Makefile.common\fP found in most TDE application sources.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB-n, \-\-dry-run\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1 b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
index 514fd6131..f0bc71a3e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-cvs2dist \- convert subdirectories within KDE CVS into standalone
+cvs2dist \- convert subdirectories within TDE CVS into standalone
 source packages
 .SH SYNOPSIS
 .B cvsdist
@@ -43,7 +43,7 @@ source packages
 .B cvsdist
 \fB\-h, \-\-help\fP
 .SH DESCRIPTION
-Each module in the KDE CVS tree contains a large number of applications
+Each module in the TDE CVS tree contains a large number of applications
 all bundled together.
 \fBcvs2dist\fP is used to extract a single application or component from
 one of these large CVS modules and bundle it into a standalone package.
@@ -79,7 +79,7 @@ The \-\- that precedes them is optional.
 Many options are available for customising these procedures, as seen below.
 Note that cvs2dist will remove any temporary files that it creates.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-n, \-\-name\fP \fIname\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1 b/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1
index eb7f02fdd..d4b7e5dfd 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1
@@ -38,7 +38,7 @@ This will allow the dialog box to display the details of the CVS
 repository to the user.
 .PP
 This utility is part of the CVS service provided with Cervisia, which in
-turn is part of the KDE Software Development Kit.
+turn is part of the TDE Software Development Kit.
 .SH OPTIONS
 For a full summary of options, run \fIcvsaskpass \-\-help\fP.
 .SH RETURN VALUE
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1 b/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1
index 9e58dcc3c..7181ac671 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1
@@ -31,7 +31,7 @@ have the chance to confirm or abort before any commits are made.
 .PP
 The files must be checked out from HEAD when you run this utility.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH WARNINGS
 The branch tag is hard-coded into the script (currently it is set to
 KDE_3_4_BRANCH).
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvscheck.1 b/ubuntu/maverick/tdesdk/debian/man/cvscheck.1
index cf7576cb4..3d79c255b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvscheck.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvscheck.1
@@ -66,7 +66,7 @@ You have "cvs add"ed this file but you have not yet committed.
 R \fIfoobar.c\fP
 You have "cvs remove"d this file but you have not yet committed.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 By default cvscheck will display the status for all files in and
 beneath the requested directories.  The following options however can be
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1 b/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1
index 8c5e00807..0ca6d29f5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1
@@ -31,7 +31,7 @@ have the chance to confirm or abort before any commits are made.
 .PP
 The files must be checked out from the branch when you run this utility.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH WARNINGS
 The branch tag is hard-coded into the script (currently it is set to
 KDE_3_4_BRANCH).
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1 b/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1
index 144d35a10..b651e4414 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1
@@ -34,7 +34,7 @@ will be displayed.  Otherwise the currently checked out revision will be used.
 .PP
 This tool works with other branches as well as with HEAD.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fBM\fP +\fIdigits\fP -\fIdigits\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1 b/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1
index c773124b3..445a1a74a 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1
@@ -25,7 +25,7 @@ cvslastlog \- prints the log of the last commit for a file
 given file.
 It depends on the version of the local file, not the one on the server.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR cvsbackport (1),
 .BR cvsblame (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1 b/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1
index 0a1757ddc..aedf45aa6 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1
@@ -24,7 +24,7 @@ cvsrevertlast \- revert files in CVS by one version
 \fBcvsrevertlast\fP is used to revert all the files on the command line
 by one version in CVS.  The files will not be committed.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR cvsbackport (1),
 .BR cvsblame (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsservice.1 b/ubuntu/maverick/tdesdk/debian/man/cvsservice.1
index 11a58054b..9d5c791d7 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsservice.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvsservice.1
@@ -28,7 +28,7 @@ access the service using the standard
 .BR dcop (1)
 command-line tool.
 .PP
-DCOP is the Desktop Communication Protocol used throughout KDE.
+DCOP is the Desktop Communication Protocol used throughout TDE.
 .PP
 The CVS DCOP service consists of the following three parts:
 .TP
@@ -54,7 +54,7 @@ method.  There are two types of jobs.  First the non-concurrent
 job which has to run alone, like cvs update or import.  Second
 the jobs which can run concurrently like cvs log or annotate.
 .PP
-The CVS service is provided with Cervisia, which is part of the KDE
+The CVS service is provided with Cervisia, which is part of the TDE
 Software Development Kit.
 .SH OPTIONS
 For a full summary of options, run \fIcvsservice \-\-help\fP.
diff --git a/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1 b/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1
index 4d12d0759..a8a855cde 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1
@@ -28,7 +28,7 @@ Source files must be in C or C++.
 If no source files are specified then all C/C++ files in or beneath the
 current directory will be used.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH AUTHOR
 This manual page was prepared by Ben Burton <bab@debian.org>
 for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/tdesdk/debian/man/demangle.1 b/ubuntu/maverick/tdesdk/debian/man/demangle.1
index b387aacd9..8f4f3922f 100644
--- a/ubuntu/maverick/tdesdk/debian/man/demangle.1
+++ b/ubuntu/maverick/tdesdk/debian/man/demangle.1
@@ -24,7 +24,7 @@ demangle \- undo C++ name mangling for symbols
 input and converts these names to human-readable form on standard
 output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH EXAMPLE
 Create a file called \fInames\fP containing the following mangled symbol
 names:
diff --git a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
index ce66a6b30..88bcd0b0d 100644
--- a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
+++ b/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
@@ -26,7 +26,7 @@ dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree fo
 Perl's Devel::DProf profiling package, and converts it into calltree format
 for use by KCachegrind.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-f\fP \fIinput\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1 b/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1
index 8bd4fcac4..0078442ef 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1
@@ -31,7 +31,7 @@ get the corresponding line numbers.
 The argument \fIbinary\fP must be the binary that generated the log
 \fIdmalloc-log\fP.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH NOTES
 You may wish to direct the output from extend_dmalloc to a file, since
 otherwise gdb seems to prompt for a return as if you are at the end of a
diff --git a/ubuntu/maverick/tdesdk/debian/man/extractattr.1 b/ubuntu/maverick/tdesdk/debian/man/extractattr.1
index fe223fc1f..7e506e449 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extractattr.1
+++ b/ubuntu/maverick/tdesdk/debian/man/extractattr.1
@@ -33,7 +33,7 @@ them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
 .PP
 Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-\-attr=\fP\fIname\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/extractrc.1 b/ubuntu/maverick/tdesdk/debian/man/extractrc.1
index de8ac9546..130fdb089 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extractrc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/extractrc.1
@@ -33,7 +33,7 @@ them.
 .PP
 It understands both Qt designer (.ui) files and XML GUI (.rc) files.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Note that the old \fB\-\-lines\fP option is deprecated; source line
 numbers are now always included in comments.
diff --git a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
index 46c479bb4..32b23294e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
+++ b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
@@ -16,17 +16,17 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-findmissingcrystal \- determine which KDE Crystal icons are the same as
-the KDE Classic hicolor icons
+findmissingcrystal \- determine which TDE Crystal icons are the same as
+the TDE Classic hicolor icons
 .SH SYNOPSIS
 .B findmissingcrystal
 .I module
 .SH DESCRIPTION
 \fBfindmissingcrystal\fP is a small utility that runs through the icons
-in the given KDE module and determines which Crystal icons from that
-module are identical to the old KDE Classic hicolor icons.
+in the given TDE module and determines which Crystal icons from that
+module are identical to the old TDE Classic hicolor icons.
 .PP
-This script \fBmust\fP be run from the top-level directory of a KDE source
+This script \fBmust\fP be run from the top-level directory of a TDE source
 tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
 It is assumed that \fImodule\fP is a top-level module in the source tree,
 and it is also assumed that the source tree contains the \fItdeartwork\fP
@@ -36,7 +36,7 @@ For each Crystal icon in the given module, a message will be output
 describing whether the icon is new (no matching hicolor icon was found),
 different from the hicolor icon or the same as the hicolor icon.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH AUTHOR
 This manual page was prepared by Ben Burton <bab@debian.org>
 for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1 b/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1
index c7a75a2f3..43ae3dfff 100644
--- a/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1
+++ b/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH FIXKDEINCLUDES 1 "January 31, 2004"
+.TH FIXTDEINCLUDES 1 "January 31, 2004"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-fixkdeincludes \- reduce the number of #includes in KDE source files
+fixkdeincludes \- reduce the number of #includes in TDE source files
 .SH SYNOPSIS
 .B fixkdeincludes
 [ \fB\-v, \-\-verbose\fP ]
@@ -27,8 +27,8 @@ fixkdeincludes \- reduce the number of #includes in KDE source files
 .B fixkdeincludes \-\-help
 .SH DESCRIPTION
 \fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
-files.  Much of its processing is specific to KDE sources and so it
-might not work so well with sources for non-KDE applications.
+files.  Much of its processing is specific to TDE sources and so it
+might not work so well with sources for non-TDE applications.
 .PP
 The following problems are identified by fixkdeincludes:
 .PP
@@ -51,9 +51,9 @@ will simply be written to standard output.
 The list of C++ sources to examine should be given on the command-line.
 If no files are given, all C++ sources in or beneath the current
 directory will be examined (with the exception of directories whose
-\fIMakefile.am\fP contains \-UQT_NO_COMPAT or \-UKDE_NO_COMPAT).
+\fIMakefile.am\fP contains \-UQT_NO_COMPAT or \-UTDE_NO_COMPAT).
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-v, \-\-verbose\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1 b/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1
index 62ed8d738..17ce46a61 100644
--- a/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1
+++ b/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-fixuifiles \- remove undesirable features from Qt/KDE .ui files
+fixuifiles \- remove undesirable features from TQt/TDE .ui files
 .SH SYNOPSIS
 .B fixuifiles
 [ \fB\-v, \-\-verbose\fP ]
@@ -25,7 +25,7 @@ fixuifiles \- remove undesirable features from Qt/KDE .ui files
 .br
 .B fixuifiles \-\-help
 .SH DESCRIPTION
-\fBfixuifiles\fP processes one or more Qt/KDE user interface definition
+\fBfixuifiles\fP processes one or more TQt/TDE user interface definition
 files (.ui files) and tries to remove some of the insanities found
 therein.  If no filenames are given, fixuifiles will process all .ui
 files in or beneath the current directory.
@@ -47,7 +47,7 @@ MIN_CONFIG macro).  These files may be in the directory containing the .ui
 file or any parent directory.  If no threshold Qt version is found,
 a sensible default will be used.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-v, \-\-verbose\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
index a07ce76b4..8c4d4441c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
+++ b/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
@@ -26,7 +26,7 @@ hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree forma
 as output by the hotshot python profiler, and converts them into
 calltree format for use by KCachegrind.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-o\fP \fIoutput\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1 b/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1
index acfcc1100..1010ecd52 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kapptemplate \- creates a framework to develop a KDE application
+kapptemplate \- creates a framework to develop a TDE application
 .SH SYNOPSIS
 .B kapptemplate
 [ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
@@ -26,11 +26,11 @@ kapptemplate \- creates a framework to develop a KDE application
 .B kapptemplate \-\-help
 .SH DESCRIPTION
 \fBKAppTemplate\fP is a shell script that will create the necessary
-framework to develop various KDE applications.  It takes care of the
+framework to develop various TDE applications.  It takes care of the
 autoconf/automake code as well as providing a skeleton and example of
 what the code typically looks like.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .SS General Options
 .TP
@@ -45,7 +45,7 @@ Use default values instead of prompting.
 .SS Framework Types
 .TP
 \-\-full\-app
-Create a full featured KDE application.
+Create a full featured TDE application.
 .TP
 \-\-kpart\-app
 Create a full featured KPart application.
@@ -54,7 +54,7 @@ Create a full featured KPart application.
 Create a KPart plugin framework.
 .TP
 \-\-existing
-Converting existing source to an automake/autoconf KDE framework.
+Converting existing source to an automake/autoconf TDE framework.
 .SH FILES
 .TP
 .I ~/.kapptemplate
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabel.1 b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
index 822d01f5f..047e3626d 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabel.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kbabel \- a PO-file editor for KDE
+kbabel \- a PO-file editor for TDE
 .SH SYNOPSIS
 .B kbabel
 .RI "[ " generic-options " ]"
@@ -35,7 +35,7 @@ a multi functional catalog manager which allows you to keep track of many
 PO-files at once.  KBabelDict is a dictionary to assist with searching
 for common translations.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kbabel-specific options.
 For a full summary of options, run \fIkbabel \-\-help\fP.
@@ -52,14 +52,14 @@ Load the configuration from the given file.
 .BR catalogmanager (1),
 .BR kbabeldict (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kbabel/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kbabel/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1 b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
index 0e6c11d81..ffd9b4658 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
@@ -33,7 +33,7 @@ functional catalog manager which allows you to keep track of many
 PO-files at once.  KBabelDict (this program) is a dictionary to assist
 with searching for common translations.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kbabeldict-specific options.
 For a full summary of options, run \fIkbabeldict \-\-help\fP.
@@ -44,14 +44,14 @@ Disable splashscreen at startup.
 .BR kbabel (1),
 .BR catalogmanager (1).
 .PP
-Full user documentation for KBabel is available through the KDE Help Centre.
+Full user documentation for KBabel is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kbabel/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kbabel/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1 b/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1
index c16006086..29b9c38d7 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kbugbuster \- front end for the KDE bug tracking system
+kbugbuster \- front end for the TDE bug tracking system
 .SH SYNOPSIS
 .B kbugbuster
 .RI "[ " generic-options " ]"
@@ -24,11 +24,11 @@ kbugbuster \- front end for the KDE bug tracking system
 [ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
 [ \fB\-\-bug\fP \fInumber\fP ]
 .SH DESCRIPTION
-\fBKBugBuster\fP is a GUI front end for the KDE bug tracking system.
+\fBKBugBuster\fP is a GUI front end for the TDE bug tracking system.
 It allows the user to view and manipulate bug reports and provides a
 variety of options for searching through reports.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kbugbuster-specific options.
 For a full summary of options, run \fIkbugbuster \-\-help\fP.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1 b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
index 4d9bc9d14..1911442c2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH KDEDOC 1 "January 31, 2004"
+.TH TDEDOC 1 "January 31, 2004"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdedoc \- view documentation for a KDE class
+kdedoc \- view documentation for a TDE class
 .SH SYNOPSIS
 .B kdedoc
 .I classname
 .SH DESCRIPTION
-\fBkdedoc\fP opens the documentation for the KDE class \fIclassname\fP
+\fBkdedoc\fP opens the documentation for the TDE class \fIclassname\fP
 in kfm/konqueror.  Note that the class name is case sensitive.  It is
 assumed that you have the tdelibs documentation installed.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH EXAMPLES
 To bring up help on the class TDEAboutDialog:
 .PP
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1 b/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1
index cba89c7b0..41cce73a5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1
@@ -30,7 +30,7 @@ After kdelnk2desktop.py is run, this will be replaced by a new file
 ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
 removed.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH WARNING
 If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
 the results of this script are unpredictable.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
index 1f92a6b90..8acd79df1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
@@ -16,12 +16,12 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdemangen.pl \- automatically create a draft manpage for a KDE app
+kdemangen.pl \- automatically create a draft manpage for a TDE app
 .SH SYNOPSIS
 .B kdemangen.pl
 .I /path/to/application
 .SH DESCRIPTION
-\fBkdemangen.pl\fP will automatically create a draft manpage for a KDE
+\fBkdemangen.pl\fP will automatically create a draft manpage for a TDE
 application.  Manpages are always better when hand-tailored, but this
 should give you a fairly good start.
 .PP
@@ -34,13 +34,13 @@ subdirectory of the application sources.
 .PP
 The new manpage will be written to standard output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH WARNING
-This utility will only work for a full KDE application that uses
-TDECmdLineArgs (which most full KDE applications do).
+This utility will only work for a full TDE application that uses
+TDECmdLineArgs (which most full TDE applications do).
 .SH EXAMPLE
 .RS
-cd /path/to/kde/srcs/tdeedu/debian
+cd /path/to/tde/srcs/tdeedu/debian
 .br
 kdemangen /usr/bin/kstars > kstars.1
 .RE
diff --git a/ubuntu/maverick/tdesdk/debian/man/kminspector.1 b/ubuntu/maverick/tdesdk/debian/man/kminspector.1
index 911e890bf..29cb70e5b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kminspector.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kminspector.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kminspector \- run a program with the KDE memory leak tracer
+kminspector \- run a program with the TDE memory leak tracer
 .SH SYNOPSIS
 .B kminspector
 \fIprogram\fP [ \fIprogram-args\fP ]
@@ -28,13 +28,13 @@ allocation tree through \fIless\fP.
 The given program does not need to be specially compiled.
 .PP
 This utility is provided with KMtrace,
-a KDE tool to assist with malloc debugging using
+a TDE tool to assist with malloc debugging using
 glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
 current (9/9/2000) glibc versions only logs the return-address of the
 malloc/free call. The library included with KMtrace
 logs a complete backtrace upon malloc/free.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR demangle (1),
 .BR kmmatch (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/kmmatch.1 b/ubuntu/maverick/tdesdk/debian/man/kmmatch.1
index f8ceee27b..d80c15542 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kmmatch.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kmmatch.1
@@ -37,11 +37,11 @@ This utility will find which of the symbols in \fIcall-file\fP are
 present in \fImap-file\fP and write them to standard error, one per
 line, in the order in which they appear in \fIcall-file\fP.
 .PP
-Note that this utility is called \fBmatch\fP in the original KDE
+Note that this utility is called \fBmatch\fP in the original TDE
 distribution; it has been renamed to \fBkmmatch\fP in Debian to
 avoid conflicts with unrelated packages.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR demangle (1),
 .BR kminspector (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/kmtrace.1 b/ubuntu/maverick/tdesdk/debian/man/kmtrace.1
index d51644bef..14f5f9fc8 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kmtrace.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kmtrace.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kmtrace \- a KDE memory leak tracer
+kmtrace \- a TDE memory leak tracer
 .SH SYNOPSIS
 .B kmtrace
 [ \fIgeneric-options\fP ]
@@ -27,7 +27,7 @@ kmtrace \- a KDE memory leak tracer
 [ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
 [ \fItrace-log\fP ]
 .SH DESCRIPTION
-\fBKMtrace\fP is a KDE tool to assist with malloc debugging using
+\fBKMtrace\fP is a TDE tool to assist with malloc debugging using
 glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
 current (9/9/2000) glibc versions only logs the return-address of the
 malloc/free call. The library included with KMtrace
@@ -36,7 +36,7 @@ logs a complete backtrace upon malloc/free.
 KMtrace will investigate the trace log specified on the command line,
 or \fIktrace.out\fP if no trace log is specified.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kmtrace-specific options.
 For a full summary of options, run \fIkmtrace \-\-help\fP.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kompare.1 b/ubuntu/maverick/tdesdk/debian/man/kompare.1
index ab3b696c6..e777752e1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kompare.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kompare.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kompare \- a KDE GUI for viewing differences between files
+kompare \- a TDE GUI for viewing differences between files
 .SH SYNOPSIS
 .B kompare
 [ \fIgeneric-options\fP ]
@@ -44,7 +44,7 @@ from standard input.  Thus (for instance) Kompare can be used as:
 cvs diff | kompare \-o \-
 .RE
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kompare-specific options.
 For a full summary of options, run \fIkompare \-\-help\fP.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1 b/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1
index fe57f3714..5439127ae 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1
@@ -39,7 +39,7 @@ By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
 screenshot of the interface instead and exit immediately.  Other options
 are available to control precisely how this screenshot is constructed.
 .PP
-This application is part of the KDE Software Development Kit.
+This application is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the kuiviewer-specific options.
 For a full summary of options, run \fIkuiviewer \-\-help\fP.
diff --git a/ubuntu/maverick/tdesdk/debian/man/licensecheck.1 b/ubuntu/maverick/tdesdk/debian/man/licensecheck.1
index 541014d63..48728f2c2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/licensecheck.1
+++ b/ubuntu/maverick/tdesdk/debian/man/licensecheck.1
@@ -27,7 +27,7 @@ source file and tries to determine which license the file is placed
 under.  It does this by searching for blocks of text that it recognises
 as belonging to various licenses.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 .B \-v
diff --git a/ubuntu/maverick/tdesdk/debian/man/makeobj.1 b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
index 6af366855..50a9f864f 100644
--- a/ubuntu/maverick/tdesdk/debian/man/makeobj.1
+++ b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
@@ -29,8 +29,8 @@ The command-line arguments will (generally) be passed directly to make.
 .PP
 This script is useful if the source directory is different from the
 build directory and the Makefiles are kept in the build directory, as is
-common for instance when building the KDE sources.  This script can however
-be used in more standard scenarios (such as non-KDE projects for which the
+common for instance when building the TDE sources.  This script can however
+be used in more standard scenarios (such as non-TDE projects for which the
 source and build directories are the same), where it will behave just like
 make.
 .PP
@@ -38,7 +38,7 @@ One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
 should be set to indicate where the build directory is in relation to
 the source directory.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH ENVIRONMENT VARIABLES
 Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
 If the build directory is simply a subdirectory of the source directory,
diff --git a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
index c4042c126..d4f52ead4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
+++ b/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
@@ -26,7 +26,7 @@ converts them into calltree format for use by KCachegrind.
 The memprof data must be supplied on standard input, and the
 corresponding calltree data will be written to standard output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR tdecachegrind (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
index d18231d3e..0242e6cd6 100644
--- a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
+++ b/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
@@ -33,7 +33,7 @@ opreport \-gdf
 This converter will then write a separate calltree data file for each
 application, to a file of the form \fIoprof.out.<app>\fP.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR tdecachegrind (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
index 0b0e97c5e..32d8644e9 100644
--- a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
+++ b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-package_crystalsvg \- bundle up Crystal SVG sources from a KDE checkout
+package_crystalsvg \- bundle up Crystal SVG sources from a TDE checkout
 .SH SYNOPSIS
 .B package_crystalsvg
 .SH DESCRIPTION
 \fBpackage_crystalsvg\fP assumes that the current directory contains one
-or more checked-out KDE modules.  It searches these modules for Crystal
+or more checked-out TDE modules.  It searches these modules for Crystal
 SVG vector sources (.svgz or .svg.gz files)
 and packages them up into a tarball.  The tarball will also
 contain \fIFILES\fP (describing the contents of the tarball and which
-KDE modules/paths they were copied from) as well as some other bits and
+TDE modules/paths they were copied from) as well as some other bits and
 pieces.
 .PP
 Note that you must at least have tdelibs checked out for this utility to
@@ -33,7 +33,7 @@ run.
 .PP
 The final tarball will be created in the current working directory.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH AUTHOR
 package_crystalsvg was written by Frans Englich <frans.englich@telia.com>.
 .br
diff --git a/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1 b/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1
index cc10dd511..c86c17275 100644
--- a/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1
+++ b/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1
@@ -35,7 +35,7 @@ also be included on the command line.
 .PP
 The final animated MNG image will be written to standard output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH EXAMPLE
 The following example will combine the files hi32-action-kde-0000.png,
 hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
diff --git a/ubuntu/maverick/tdesdk/debian/man/po2xml.1 b/ubuntu/maverick/tdesdk/debian/man/po2xml.1
index d1be83c89..d2f7fe5df 100644
--- a/ubuntu/maverick/tdesdk/debian/man/po2xml.1
+++ b/ubuntu/maverick/tdesdk/debian/man/po2xml.1
@@ -26,7 +26,7 @@ XML file \fIoriginal-XML\fP using the gettext message file
 \fItranslated-PO\fP.  The resulting translated XML file is sent to standard
 output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR split2po (1),
 .BR swappo (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
index b98a06aec..b5cf9082c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
+++ b/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
@@ -25,7 +25,7 @@ pprof2calltree \- convert APD profiling data to KCachegrind calltree format
 APD (http://pecl.php.net/apd/), and converts it into calltree format
 for use by KCachegrind.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-f\fP \fIinput\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
index b6875d861..108c7e4db 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
+++ b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
@@ -34,7 +34,7 @@ This tool works better if the source directory is not the same as the
 build directory, since it will not print directories containing old
 executables.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-f\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/qtdoc.1 b/ubuntu/maverick/tdesdk/debian/man/qtdoc.1
index 1559c25b4..3b7c09f60 100644
--- a/ubuntu/maverick/tdesdk/debian/man/qtdoc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/qtdoc.1
@@ -27,7 +27,7 @@ that the class name is case insensitive).  Otherwise the main Qt help
 page is opened.  It is assumed that you have the Qt documentation
 installed.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH ENVIRONMENT VARIABLES
 .TP
 QTDIR
diff --git a/ubuntu/maverick/tdesdk/debian/man/split2po.1 b/ubuntu/maverick/tdesdk/debian/man/split2po.1
index 4269f815b..539e2f6c8 100644
--- a/ubuntu/maverick/tdesdk/debian/man/split2po.1
+++ b/ubuntu/maverick/tdesdk/debian/man/split2po.1
@@ -32,7 +32,7 @@ must be the result of translating
 into another language.  It is this translation that the resulting
 PO-file will represent.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH ENVIRONMENT VARIABLES
 .TP
 NO_CREDITS
@@ -40,8 +40,8 @@ If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
 will be omitted.  By default these are always included at the end of
 the PO-file, with empty message strings.
 .br
-These messages are used with KDE documentation, so you may wish to set
-NO_CREDITS if you are working with some other type of non-KDE documentation.
+These messages are used with TDE documentation, so you may wish to set
+NO_CREDITS if you are working with some other type of non-TDE documentation.
 .TP
 REPORT_MISMATCHES
 Set this variable to "no" if you wish mismatch reporting to be
diff --git a/ubuntu/maverick/tdesdk/debian/man/swappo.1 b/ubuntu/maverick/tdesdk/debian/man/swappo.1
index 96a6d3f94..bb1289d9b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/swappo.1
+++ b/ubuntu/maverick/tdesdk/debian/man/swappo.1
@@ -30,7 +30,7 @@ French to English.
 The new PO-file will be written to standard output.  The old PO-file
 will remain untouched.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR po2xml (1),
 .BR split2po (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
index eebce39cc..d5f3ea064 100644
--- a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
+++ b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
@@ -31,7 +31,7 @@ For visualising the output from other profiling tools, several converters
 are available.  On Debian systems these can be found in the
 \fItdecachegrind-converters\fP package.
 .PP
-This application is part of the KDE Software Development Kit.
+This application is part of the TDE Software Development Kit.
 .SH OPTIONS
 Below are the tdecachegrind-specific options.
 For a full summary of options, run \fItdecachegrind \-\-help\fP.
@@ -50,14 +50,14 @@ Visualise data from the given trace.
 .BR pprof2calltree (1),
 .BR valgrind (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/tdecachegrind/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/tdecachegrind/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/tdekillall.1 b/ubuntu/maverick/tdesdk/debian/man/tdekillall.1
index f83c8b479..92bf4380c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/tdekillall.1
+++ b/ubuntu/maverick/tdesdk/debian/man/tdekillall.1
@@ -25,7 +25,7 @@ tdekillall \- kills processes started with tdeinit
 that were started through tdeinit.  Specifically, it kills all processes
 \fBtdeinit:\fP \fIprocess-name\fP.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-\fP\fIsignal\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/testkspy.1 b/ubuntu/maverick/tdesdk/debian/man/testkspy.1
index c04e00c0f..afdc702a4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/testkspy.1
+++ b/ubuntu/maverick/tdesdk/debian/man/testkspy.1
@@ -25,7 +25,7 @@ testkspy \- show off KSpy's capabilities
 It simply uses KSpy to spy on itself.
 .PP
 \fBKSpy\fP is a tiny library which can be used to graphically display
-the QObjects in use by a Qt/KDE app.  In addition to the object tree,
+the TQObjects in use by a TQt/TDE app.  In addition to the object tree,
 you can also view the properties, signals and slots of any QObject.
 .PP
 Basically it provides much the same info as QObject::dumpObjectTree() and
@@ -33,7 +33,7 @@ QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
 minimal overhead for the application, because the kspy library is
 loaded dynamically using KLibLoader.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 For a full summary of options, run \fItestkspy \-\-help\fP.
 .SH SEE ALSO
diff --git a/ubuntu/maverick/tdesdk/debian/man/transxx.1 b/ubuntu/maverick/tdesdk/debian/man/transxx.1
index f7c843fc9..6dba22392 100644
--- a/ubuntu/maverick/tdesdk/debian/man/transxx.1
+++ b/ubuntu/maverick/tdesdk/debian/man/transxx.1
@@ -29,7 +29,7 @@ strings, but otherwise text will be translated to "xx".
 .PP
 The fleshed-out PO-file is sent to standard output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH OPTIONS
 .TP
 \fB\-\-text\fP \fItranslation\fP
diff --git a/ubuntu/maverick/tdesdk/debian/man/umbrello.1 b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
index 338486063..3c5d77d5e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/umbrello.1
+++ b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
@@ -22,7 +22,7 @@ umbrello \- a UML modelling tool and code generator
 .RI "[ " generic-options " ]"
 [ \fIfile\fP ]
 .SH DESCRIPTION
-\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for KDE.
+\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for TDE.
 With UML you can create diagrams of software and other systems in an
 industry standard format.  Umbrello can also generate code from your
 UML diagrams in a number of programming languages.
@@ -31,18 +31,18 @@ The program supports class diagrams, sequence diagrams, collaboration
 diagrams, use case diagrams, state diagrams, activity diagrams, component
 diagrams and deployment diagrams.
 .PP
-This application is part of the KDE Software Development Kit.
+This application is part of the TDE Software Development Kit.
 .SH OPTIONS
 For a full summary of options, run \fIumbrello \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/umbrello/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/umbrello/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/xml2pot.1 b/ubuntu/maverick/tdesdk/debian/man/xml2pot.1
index d0920db54..0b1a293d5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/xml2pot.1
+++ b/ubuntu/maverick/tdesdk/debian/man/xml2pot.1
@@ -31,7 +31,7 @@ with
 .BR po2xml (1)
 to translate the original XML file into these other languages.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH SEE ALSO
 .BR po2xml (1),
 .BR split2po (1),
diff --git a/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1 b/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1
index b7115ad20..d6a4330ad 100644
--- a/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1
+++ b/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1
@@ -31,7 +31,7 @@ The given timezone list should be in the same format as the system
 .PP
 The new PO-file template will be written to standard output.
 .PP
-This utility is part of the KDE Software Development Kit.
+This utility is part of the TDE Software Development Kit.
 .SH AUTHOR
 zonetab2pot.py was written by Lukas Tinkl <lukas@kde.org>.
 .br
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
index 25ddc2247..8a17e5024 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
@@ -1,7 +1,7 @@
 KCachegrind for Debian
 ----------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdesdk-doc-html.
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
index 4c9261ebb..27464553a 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
@@ -1,4 +1,4 @@
-?package(tdecachegrind):\
+?package(tdecachegrind-trinity):\
   needs="x11"\
   section="Applications/Programming"\
   hints="TDE"\
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
index d2e14e34f..9ff3f0552 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
@@ -2,7 +2,7 @@ Document: tdesdk-doc-html-tdecachegrind
 Title: KCachegrind Handbook
 Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 Abstract: KCachegrind is a profile data visualization tool, written
- using the KDE environment.
+ using the TDE environment.
 Section: Apps/Programming
 
 Format: HTML
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
index 4fd8618d0..30cf06ddf 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
@@ -1,8 +1,8 @@
-KDE Software Development Kit for Debian
+TDE Software Development Kit for Debian
 ---------------------------------------
 
 The tdesdk-misc package includes palettes for both the Gimp and Xpaint
-that match the KDE standard colour palette.  They may be useful for
+that match the TDE standard colour palette.  They may be useful for
 designing themes and icons.
 
 These palettes have been placed in /usr/share/kdepalettes/.
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
index ec8ff7295..f0ff0c7b8 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
@@ -13,7 +13,7 @@ Debugger macros:
 Editor helper files:
 
   Both vim and emacs helper files are provided containing many functions
-  and keybindings for developing KDE/Qt/C++ applications.
+  and keybindings for developing TDE/TQt/C++ applications.
 
   To use the vim helper file, add this line to your ~/.vimrc :
 
@@ -39,7 +39,7 @@ Shell completion controls:
   To enable completion controls for zsh, you need to add the following
   lines to your ~/.zshrc :
 
-    # Add the KDE completion controls to the zsh function path.
+    # Add the TDE completion controls to the zsh function path.
     set -A fpath $fpath /usr/share/tdesdk-scripts/completions/zsh
 
     # Initialise the zsh completion system.
@@ -54,7 +54,7 @@ Shell completion controls:
 Valgrind error suppressions:
 
   A valgrind suppression file is included for ignoring things we don't
-  care about when valgrinding KDE applications.
+  care about when valgrinding TDE applications.
 
   The suppression file is provided as /usr/lib/valgrind/kde.supp .
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
index 2f53456c9..f710e6d6d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
@@ -1,10 +1,10 @@
-KDE Software Development Kit for Debian
+TDE Software Development Kit for Debian
 ---------------------------------------
 
 Package tdesdk is a metapackage that depends on the core components of
-the KDE Software Development Kit and suggests the remaining components.
+the TDE Software Development Kit and suggests the remaining components.
 
-Some applications provide documentation in a docbook format that the KDE
+Some applications provide documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdesdk-doc-html.
 
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
index c151a589b..54b6b0c42 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
@@ -1,7 +1,7 @@
 Umbrello for Debian
 -------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdesdk-doc-html.
 
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
index 234f273e9..702341646 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
@@ -1,4 +1,4 @@
-?package(umbrello):\
+?package(umbrello-trinity):\
   needs="x11"\
   section="Applications/Programming"\
   hints="TDE"\
-- 
cgit v1.2.3