Branding cleanup on Debian and Ubuntu

64 files changed, 391 insertions, 391 deletions

diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index d31d2c6e9..1a164878c 100644
--- a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,4 +1,4 @@
-Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes
+Not build using tar inside .orig, no DEB_TDE_CVS_MAKE := yes
 Don't build-dep on libgnokii-dev, not in main
 Install /opt/trinity/share/services/kontact/knode* in knode and add replaces
 don't build-dep on gnokii or automake1.9
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.menu b/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
index 06cf54f0e..3614c2f89 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
@@ -1,4 +1,4 @@
-?package(akregator):\
+?package(akregator-trinity):\
 	needs="X11"\
 	section="Applications/Network/Web News"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/versions.pl b/ubuntu/maverick/tdepim/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdepim/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/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 3c343d047..46481b8f1 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -25,7 +25,7 @@ Breaks: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
 Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps 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.
@@ -68,11 +68,11 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
  libksieve0-trinity-dev (= ${Source-Version}),
  libktnef1-trinity-dev (= ${Source-Version}),
  libmimelib1-trinity-dev (= ${Source-Version})
-Description: KDE Personal Information Management [development]
+Description: TDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
@@ -82,12 +82,12 @@ Architecture: all
 Replaces: kdepim-kde3-doc (<< 4:14.0.0~), kdepim-trinity-doc (<< 4:14.0.0~)
 Breaks: kdepim-kde3-doc (<< 4:14.0.0~), kdepim-trinity-doc (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, doc-base
-Description: KDE Personal Information Management library documentation
- KDE core library documentation. You need this documentation to develop KDE PIM
+Description: TDE Personal Information Management library documentation
+ TDE core library documentation. You need this documentation to develop TDE PIM
  applications.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
@@ -97,15 +97,15 @@ Architecture: all
 Replaces: kdepim-kde3-doc-html (<< 4:14.0.0~), kdepim-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdepim-kde3-doc-html (<< 4:14.0.0~), kdepim-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdepim-trinity
-Description: KDE PIM documentation in HTML format
+Description: TDE PIM documentation in HTML format
  By default the Personal Information Management applications provided with
- KDE only provide their documentation in KDE docbook format, which can only
+ TDE only provide their documentation in TDE docbook format, which can only
  be read by Konqueror or KHelpCenter. This package provides all of the
- KDE PIM documentation converted to HTML format so it can be read with any
+ TDE PIM documentation converted to HTML format so it can be read with any
  web browser.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
 
@@ -115,13 +115,13 @@ Architecture: any
 Replaces: akregator-kde3 (<< 4:14.0.0~), akregator-trinity (<< 4:14.0.0~)
 Breaks: akregator-kde3 (<< 4:14.0.0~), akregator-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: RSS feed aggregator for KDE
+Description: RSS feed aggregator for TDE
  aKregator is a fast, lightweight, and intuitive feed reader program
- for KDE.  It allows you to quickly browse through hundreds of
+ for TDE.  It allows you to quickly browse through hundreds of
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://akregator.kde.org/
 
@@ -132,14 +132,14 @@ Replaces: kaddressbook-kde3 (<< 4:14.0.0~), kaddressbook-trinity (<< 4:14.0.0~)
 Breaks: kaddressbook-kde3 (<< 4:14.0.0~), kaddressbook-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: tdepim-tderesources-trinity, tdebase-tdeio-plugins-trinity
-Description: KDE NG addressbook application
- KAddressBook is the main address book application for KDE; it enables you
+Description: TDE NG addressbook application
+ KAddressBook is the main address book application for TDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
  your contacts to many different locations, including the local file system,
  LDAP servers, and SQL databases.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kalarm-trinity
 Section: tde
@@ -161,10 +161,10 @@ Description: Trinity alarm message, command and email scheduler
  .
  As an alternative to using the graphical interface, alarms can be scheduled
  from the command line or via DCOP calls from other programs. KAlarm is
- KDE-based, but will also run on other desktops.
+ TDE-based, but will also run on other desktops.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kandy-trinity
 Section: utils
@@ -176,12 +176,12 @@ Description: Trinity mobile phone utility
  At the moment Kandy is more or less a terminal program with some special
  features to store commands and their parameters, but is also has a simple GUI
  to access the phone book of a mobile phone and it is able to save this phone
- book to the KDE address book.
+ book to the TDE address book.
  .
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: karm-trinity
 Section: utils
@@ -193,8 +193,8 @@ Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-tdefile-plugins-trinity
 Section: tde
@@ -202,11 +202,11 @@ Architecture: any
 Replaces: kdepim-kfile-plugins-kde3 (<< 4:14.0.0~), kdepim-kfile-plugins-trinity (<< 4:14.0.0~)
 Breaks: kdepim-kfile-plugins-kde3 (<< 4:14.0.0~), kdepim-kfile-plugins-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
-Description: KDE File dialog plugins for palm and vcf files
+Description: TDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-tdeio-plugins-trinity
 Section: tde
@@ -218,8 +218,8 @@ Description: Trinity pim I/O Slaves
  This package includes the pim tdeioslaves. This includes imap4, sieve,
  and mbox.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-tderesources-trinity
 Section: tde
@@ -234,8 +234,8 @@ Description: Trinity pim resource plugins
  servers. It also includes plugins for features such as blogging and
  tracking feature plans.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-wizards-trinity
 Section: tde
@@ -245,11 +245,11 @@ Breaks: kdepim-wizards-kde3 (<< 4:14.0.0~), kdepim-wizards-trinity (<< 4:14.0.0~
 Depends: ${shlibs:Depends}
 Suggests: egroupware
 Description: Trinity server configuration wizards
- This package contains KDE-based wizards for configuring eGroupware,
+ This package contains TDE-based wizards for configuring eGroupware,
  Kolab, and SUSE Linux Openexchange servers.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kitchensync-trinity
 Section: tde
@@ -263,8 +263,8 @@ Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
  development (?).  Kitchensync uses opensync.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kleopatra-trinity
 Section: net
@@ -273,11 +273,11 @@ Replaces: kleopatra-kde3 (<< 4:14.0.0~), kleopatra-trinity (<< 4:14.0.0~)
 Breaks: kleopatra-kde3 (<< 4:14.0.0~), kleopatra-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
 Description: Trinity Certificate Manager
- Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
+ Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
  keybox and for retrieving certificates from LDAP servers.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kmail-trinity
 Section: mail
@@ -289,15 +289,15 @@ Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Provides: imap-client, mail-reader
 Description: Trinity Email client
- KMail is a fully-featured email client that fits nicely into the KDE
+ KMail is a fully-featured email client that fits nicely into the TDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
  You need to install tdepim-tdeio-plugins if you want to use IMAP or
  mbox files, and/or tdebase-tdeio-plugins if you want to use POP3.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://kmail.kde.org/
  
@@ -311,8 +311,8 @@ Description: Trinity KMail mail folder converter
  Converts mail folders to KMail format.  Formats supported for import
  include Outlook Express, Evolution, and plain mbox.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: knode-trinity
 Section: news
@@ -327,8 +327,8 @@ Description: Trinity news reader
  MIME attachments, article scoring, and creating and verifying GnuPG
  signatures.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: knotes-trinity
 Section: tde
@@ -342,8 +342,8 @@ Description: Trinity sticky notes
  automatically when you exit the program, and they display when you open the
  program.  The program supports printing and mailing your notes.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kode-trinity
 Section: devel
@@ -356,8 +356,8 @@ Description: Helper library for programmatic generation of C++ code
  and kxml_compiler for generation of C++ classes representing XML data
  described by RelaxNG schemes.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: konsolekalendar-trinity
 Section: tde
@@ -366,12 +366,12 @@ Replaces: konsolekalendar-kde3 (<< 4:14.0.0~), konsolekalendar-trinity (<< 4:14.
 Breaks: konsolekalendar-kde3 (<< 4:14.0.0~), konsolekalendar-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: Trinity konsole personal organizer
- KonsoleKalendar is a command-line interface to KDE calendars.
- Konsolekalendar complements the KDE KOrganizer by providing a console
+ KonsoleKalendar is a command-line interface to TDE calendars.
+ Konsolekalendar complements the TDE KOrganizer by providing a console
  frontend to manage your calendars.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kontact-trinity
 Section: tde
@@ -384,12 +384,12 @@ Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-t
 Conflicts: akregator-kontact-plugin-trinity
 Description: Trinity pim application
  Kontact is the integrated solution to your personal information management
- needs. It combines KDE applications like KMail, KOrganizer, and
+ needs. It combines TDE applications like KMail, KOrganizer, and
  KAddressBook into a single interface to provide easy access to mail,
  scheduling, address book and other PIM functionality.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://kontact.kde.org/
 
@@ -412,8 +412,8 @@ Description: Trinity personal organizer
  KOrganizer offers full synchronization with Palm Pilots, if kpilot is
  installed.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: korn-trinity
 Section: tde
@@ -422,15 +422,15 @@ Replaces: korn-kde3 (<< 4:14.0.0~), korn-trinity (<< 4:14.0.0~)
 Breaks: korn-kde3 (<< 4:14.0.0~), korn-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity
 Description: Trinity mail checker
- Korn is a KDE mail checker that can display a small summary in the Kicker
+ Korn is a TDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
  .
  Once mail is received you can have Korn run a third party program or change
  the color/icon of the Kicker display.  In addition to this you can have
  Korn run a program once you click on the docked icon in Kicker.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: ktnef-trinity
 Section: tde
@@ -443,8 +443,8 @@ Description: Trinity TNEF viewer
  format. These attachments are usually found in mails coming from Microsoft
  mail servers and embed the mail properties as well as the actual attachments.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libindex0-trinity
 Section: libs
@@ -458,8 +458,8 @@ Description: Trinity indexing library
  .
  This is the runtime package for programs that use the libindex-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libindex0-trinity-dev
 Section: libdevel
@@ -474,8 +474,8 @@ Description: Trinity indexing library [development]
  This is the development package which contains the headers for the libindex-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkcal2b-trinity
 Section: libs
@@ -492,8 +492,8 @@ Description: Trinity calendaring library
  .
  This is the runtime package for programs that use the libkcal-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkcal2-trinity-dev
 Section: libdevel
@@ -508,8 +508,8 @@ Description: Trinity calendaring library [development]
  This is the development package which contains the headers for the libkcal-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libtdepim1a-trinity
 Section: libs
@@ -520,8 +520,8 @@ Depends: ${shlibs:Depends}
 Description: Trinity PIM library
  This is the runtime package for programs that use the libtdepim-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libtdepim1-trinity-dev
 Section: libdevel
@@ -533,8 +533,8 @@ Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity
 Section: libs
@@ -545,8 +545,8 @@ Depends: ${shlibs:Depends}
 Description: Trinity gantt charting library
  This is the runtime package for programs that use the libkgantt-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity-dev
 Section: libdevel
@@ -558,8 +558,8 @@ Description: Trinity gantt charting library [development]
  This is the development package which contains the headers for the libkgantt-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity
 Section: libs
@@ -568,14 +568,14 @@ Replaces: libkleopatra1-kde3 (<< 4:14.0.0~), libkleopatra1-trinity (<< 4:14.0.0~
 Breaks: libkleopatra1-kde3 (<< 4:14.0.0~), libkleopatra1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0-trinity
-Description: KDE GnuPG interface libraries
- This library is used by several KDE applications to interface to the
+Description: TDE GnuPG interface libraries
+ This library is used by several TDE applications to interface to the
  GnuPG program.
  .
  This is the runtime package for programs that use the libkleopatra-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity-dev
 Section: libdevel
@@ -585,14 +585,14 @@ Breaks: libkleopatra1-kde3-dev (<< 4:14.0.0~), libkleopatra1-trinity-dev (<< 4:1
 Depends: libkleopatra1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Conflicts: libkleopatra0-trinity-dev
 Description: Trinity GnuPG interface libraries [development]
- This library is used by several KDE applications to interface to the
+ This library is used by several TDE applications to interface to the
  GnuPG program.
  .
  This is the development package which contains the headers for the
  libkleopatra-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkmime2-trinity
 Section: libs
@@ -605,8 +605,8 @@ Description: Trinity MIME interface library
  This library provides a C++ interface to MIME messages, parsing them into
  an object tree.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity
 Section: libs
@@ -618,8 +618,8 @@ Description: Trinity PIM Exchange library
  This is the runtime package for programs that use the libkpimexchange-trinity
  library. 
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity-dev
 Section: libdevel
@@ -631,8 +631,8 @@ Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimidentities1-trinity
 Section: libs
@@ -641,14 +641,14 @@ Replaces: libkpimidentities1-kde3 (<< 4:14.0.0~), libkpimidentities1-trinity (<<
 Breaks: libkpimidentities1-kde3 (<< 4:14.0.0~), libkpimidentities1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: Trinity PIM user identity information library
- This library provides information to KDE programs about user identity,
+ This library provides information to TDE programs about user identity,
  such as email address, organization, etc.
  .
  This is the runtime package for programs that use the libkpimidentities-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity
 Section: libs
@@ -659,8 +659,8 @@ Depends: ${shlibs:Depends}
 Description: Trinity mail/news message filtering library
  This is the runtime package for programs that use the libksieve-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity-dev
 Section: libdevel
@@ -672,8 +672,8 @@ Description: Trinity mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve-trinity
  library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity
 Section: libs
@@ -689,8 +689,8 @@ Description: Library for handling KTNEF email attachments
  .
  This is the runtime library for packages using the ktnef-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity-dev
 Section: libdevel
@@ -707,8 +707,8 @@ Description: KTNEF handler library [development]
  This is the development package which contains the headers for the
  ktnef-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libmimelib1c2a-trinity
 Section: libs
@@ -722,8 +722,8 @@ Description: Trinity mime library
  .
  This is the runtime package for programs that use the libmimelib-trinity library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libmimelib1-trinity-dev
 Section: libdevel
@@ -732,10 +732,10 @@ Replaces: libmimelib1-kde3-dev (<< 4:14.0.0~), libmimelib1-trinity-dev (<< 4:14.
 Breaks: libmimelib1-kde3-dev (<< 4:14.0.0~), libmimelib1-trinity-dev (<< 4:14.0.0~)
 Depends: libmimelib1c2a-trinity (= ${Source-Version})
 Description: Trinity mime library [development]
- This library is used by several KDE applications to handle mime types.
+ This library is used by several TDE applications to handle mime types.
  .
  This is the development package which contains the headers for the
  libmimelib library.
  .
- This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE PIM module.
+ See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index bab9b686d..f62841b08 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -21,14 +21,14 @@ Section: tde
 Architecture: all
 Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-tdefile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
 Suggests: tdepim-doc-html
-Description: Personal Information Management apps from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: Personal Information Management apps 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 a collection of Personal Information Management
- (PIM) applications provided with the official release of KDE.
+ (PIM) applications provided with the official release of TDE.
  .
   Homepage: http://pim.kde.org/
 
@@ -47,11 +47,11 @@ Section: devel
 Architecture: any
 Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
-Description: KDE Personal Information Management [development]
+Description: TDE Personal Information Management [development]
  This package contains development files needed to compile tdepim applications.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
@@ -59,12 +59,12 @@ Package: tdepim-doc
 Section: doc
 Architecture: all
 Suggests: konqueror | www-browser, doc-base
-Description: KDE Personal Information Management library documentation
- KDE core library documentation. You need this documentation to develop KDE PIM
+Description: TDE Personal Information Management library documentation
+ TDE core library documentation. You need this documentation to develop TDE PIM
  applications.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
@@ -72,15 +72,15 @@ Package: tdepim-doc-html
 Section: doc
 Architecture: all
 Suggests: konqueror | www-browser, tdepim
-Description: KDE PIM documentation in HTML format
+Description: TDE PIM documentation in HTML format
  By default the Personal Information Management applications provided with
- KDE only provide their documentation in KDE docbook format, which can only
+ TDE only provide their documentation in TDE docbook format, which can only
  be read by Konqueror or KHelpCenter. This package provides all of the
- KDE PIM documentation converted to HTML format so it can be read with any
+ TDE PIM documentation converted to HTML format so it can be read with any
  web browser.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
 
@@ -88,13 +88,13 @@ Package: akregator
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: RSS feed aggregator for KDE
+Description: RSS feed aggregator for TDE
  aKregator is a fast, lightweight, and intuitive feed reader program
- for KDE.  It allows you to quickly browse through hundreds of
+ for TDE.  It allows you to quickly browse through hundreds of
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  .
   Homepage: http://akregator.kde.org/
 
@@ -103,21 +103,21 @@ Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: tdepim-tderesources, tdebase-kio-plugins
-Description: KDE NG addressbook application
- KAddressBook is the main address book application for KDE; it enables you
+Description: TDE NG addressbook application
+ KAddressBook is the main address book application for TDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
  your contacts to many different locations, including the local file system,
  LDAP servers, and SQL databases.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kalarm
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kmix, kttsd
-Description: KDE alarm message, command and email scheduler
+Description: TDE alarm message, command and email scheduler
  KAlarm provides a graphical interface to schedule personal timed events -
  pop-up alarm messages, command execution and sending emails. There is a
  range of options for configuring recurring events.
@@ -130,58 +130,58 @@ Description: KDE alarm message, command and email scheduler
  .
  As an alternative to using the graphical interface, alarms can be scheduled
  from the command line or via DCOP calls from other programs. KAlarm is
- KDE-based, but will also run on other desktops.
+ TDE-based, but will also run on other desktops.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kandy
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE mobile phone utility
+Description: TDE mobile phone utility
  At the moment Kandy is more or less a terminal program with some special
  features to store commands and their parameters, but is also has a simple GUI
  to access the phone book of a mobile phone and it is able to save this phone
- book to the KDE address book.
+ book to the TDE address book.
  .
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: karm
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE time tracker tool
+Description: TDE time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: tdepim-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE File dialog plugins for palm and vcf files
+Description: TDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: tdepim-kio-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase-kio-plugins (<< 4:3.4.0)
-Description: KDE pim I/O Slaves
+Description: TDE pim I/O Slaves
  This package includes the pim tdeioslaves. This includes imap4, sieve,
  and mbox.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: tdepim-tderesources
 Section: tde
@@ -190,13 +190,13 @@ Depends: ${shlibs:Depends}
 Replaces: libkcal2a (<< 4:3.4.1), kaddressbook (<< 4:3.4.1), knotes (<< 4:3.4.1)
 Recommends: ${shlibs:Recommends}, korganizer
 Suggests: knotes
-Description: KDE pim resource plugins
+Description: TDE pim resource plugins
  This package includes several plugins needed to interface with groupware
  servers. It also includes plugins for features such as blogging and
  tracking feature plans.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: tdepim-wizards
 Section: tde
@@ -204,12 +204,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdepim-dev (<< 4:3.4.1-2)
 Suggests: egroupware
-Description: KDE server configuration wizards
- This package contains KDE-based wizards for configuring eGroupware,
+Description: TDE server configuration wizards
+ This package contains TDE-based wizards for configuring eGroupware,
  Kolab, and SUSE Linux Openexchange servers.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kitchensync
 Section: tde
@@ -221,19 +221,19 @@ Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
  development.  Kitchensync uses opensync.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kleopatra
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
-Description: KDE Certificate Manager
- Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
+Description: TDE Certificate Manager
+ Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
  keybox and for retrieving certificates from LDAP servers.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kmail
 Section: mail
@@ -243,16 +243,16 @@ Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Replaces: tdepim-dev (<< 4:3.4.0), tdebase-data (<< 4:3.4.0)
 Provides: imap-client, mail-reader
-Description: KDE Email client
- KMail is a fully-featured email client that fits nicely into the KDE
+Description: TDE Email client
+ KMail is a fully-featured email client that fits nicely into the TDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
  You need to install tdepim-kio-plugins if you want to use IMAP or
  mbox files, and/or tdebase-kio-plugins if you want to use POP3.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  .
   Homepage: http://kmail.kde.org/
  
@@ -260,12 +260,12 @@ Package: kmailcvt
 Section: mail
 Architecture: any
 Depends: ${shlibs:Depends}, kmail
-Description: KDE KMail mail folder converter
+Description: TDE KMail mail folder converter
  Converts mail folders to KMail format.  Formats supported for import
  include Outlook Express, Evolution, and plain mbox.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: knode
 Section: news
@@ -273,27 +273,27 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdepim-dev (<< 4:3.4.0)
 Provides: news-reader
-Description: KDE news reader
+Description: TDE news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
  by inexperienced users, but also includes support for such features as
  MIME attachments, article scoring, and creating and verifying GnuPG
  signatures.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: knotes
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: tdepim-tderesources
-Description: KDE sticky notes
+Description: TDE sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
  program.  The program supports printing and mailing your notes.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kode
 Section: devel
@@ -304,20 +304,20 @@ Description: Helper library for programmatic generation of C++ code
  and kxml_compiler for generation of C++ classes representing XML data
  described by RelaxNG schemes.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: konsolekalendar
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE konsole personal organizer
- KonsoleKalendar is a command-line interface to KDE calendars.
- Konsolekalendar complements the KDE KOrganizer by providing a console
+Description: TDE konsole personal organizer
+ KonsoleKalendar is a command-line interface to TDE calendars.
+ Konsolekalendar complements the TDE KOrganizer by providing a console
  frontend to manage your calendars.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: kontact
 Section: tde
@@ -327,14 +327,14 @@ Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
 Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii
 Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin
 Conflicts: akregator-kontact-plugin
-Description: KDE pim application
+Description: TDE pim application
  Kontact is the integrated solution to your personal information management
- needs. It combines KDE applications like KMail, KOrganizer, and
+ needs. It combines TDE applications like KMail, KOrganizer, and
  KAddressBook into a single interface to provide easy access to mail,
  scheduling, address book and other PIM functionality.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
  .
   Homepage: http://kontact.kde.org/
 
@@ -343,7 +343,7 @@ Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview
-Description: KDE personal organizer
+Description: TDE personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
  KOrganizer aims to be a complete program for organizing appointments,
@@ -355,84 +355,84 @@ Description: KDE personal organizer
  KOrganizer offers full synchronization with Palm Pilots, if kpilot is
  installed.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: korn
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, tdepim-kio-plugins, tdebase-kio-plugins
-Description: KDE mail checker
- Korn is a KDE mail checker that can display a small summary in the Kicker
+Description: TDE mail checker
+ Korn is a TDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
  .
  Once mail is received you can have Korn run a third party program or change
  the color/icon of the Kicker display.  In addition to this you can have
  Korn run a program once you click on the docked icon in Kicker.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: ktnef
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE TNEF viewer
+Description: TDE TNEF viewer
  The TNEF File Viewer allows you to handle mail attachments using the TNEF
  format. These attachments are usually found in mails coming from Microsoft
  mail servers and embed the mail properties as well as the actual attachments.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: networkstatus
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE network status monitor
+Description: TDE network status monitor
  NetworkStatus tracks the status of network interfaces and provides
  notification to applications when this status changes.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: networkstatus-dev
 Section: tde
 Architecture: any
 Depends: networkstatus (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
-Description: KDE network status monitor [development]
+Description: TDE network status monitor [development]
  This is the development package which contains the headers for the
  networkstatus library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libindex0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE indexing library
+Description: TDE indexing library
  This library provides text indexing and is currently used by KMail
  to implement fast searches in mail bodies.
  .
  This is the runtime package for programs that use the libindex library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libindex0-dev
 Section: libdevel
 Architecture: any
 Depends: libindex0 (= ${Source-Version})
-Description: KDE indexing library [development]
+Description: TDE indexing library [development]
  This library provides text indexing and is currently used by KMail
  to implement searching through mail text.
  .
  This is the development package which contains the headers for the libindex
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkcal2b
 Section: libs
@@ -442,29 +442,29 @@ Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2, libkcal2a
 Replaces: libkcal2a
 Suggests: tdepim-tderesources
-Description: KDE calendaring library
+Description: TDE calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the runtime package for programs that use the libkcal library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkcal2-dev
 Section: libdevel
 Architecture: any
 Depends: libkcal2b (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
 Replaces: tdepim-dev (<= 4:3.5.4-1)
-Description: KDE calendaring library [development]
+Description: TDE calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the development package which contains the headers for the libkcal
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libtdepim1a
 Section: libs
@@ -472,44 +472,44 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libtdepim1
 Replaces: akregator (<< 4:3.4.0), libtdepim1
-Description: KDE PIM library
+Description: TDE PIM library
  This is the runtime package for programs that use the libtdepim library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
 Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev
 Replaces: tdepim-dev (<< 4:3.4.1)
-Description: KDE PIM library [development]
+Description: TDE PIM library [development]
  This is the development package which contains the headers for the libtdepim
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkgantt0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE gantt charting library
+Description: TDE gantt charting library
  This is the runtime package for programs that use the libkgantt library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkgantt0-dev
 Section: libdevel
 Architecture: any
 Depends: libkgantt0 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
-Description: KDE gantt charting library [development]
+Description: TDE gantt charting library [development]
  This is the development package which contains the headers for the libkgantt
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkleopatra1
 Section: libs
@@ -517,14 +517,14 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0, libkleopatra0a
 Replaces: libtdenetwork2, libkleopatra0a
-Description: KDE GnuPG interface libraries
- This library is used by several KDE applications to interface to the
+Description: TDE GnuPG interface libraries
+ This library is used by several TDE applications to interface to the
  GnuPG program.
  .
  This is the runtime package for programs that use the libkleopatra library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkleopatra1-dev
 Section: libdevel
@@ -532,15 +532,15 @@ Architecture: any
 Depends: libkleopatra1 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Conflicts: libkleopatra0-dev
 Replaces: libkleopatra0-dev
-Description: KDE GnuPG interface libraries [development]
- This library is used by several KDE applications to interface to the
+Description: TDE GnuPG interface libraries [development]
+ This library is used by several TDE applications to interface to the
  GnuPG program.
  .
  This is the development package which contains the headers for the
  libkleopatra library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkmime2
 Section: libs
@@ -548,69 +548,69 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a
 Replaces: libmimelib1a
-Description: KDE MIME interface library
+Description: TDE MIME interface library
  This library provides a C++ interface to MIME messages, parsing them into
  an object tree.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkpimexchange1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE PIM Exchange library
+Description: TDE PIM Exchange library
  This is the runtime package for programs that use the libkpimexchange
  library. 
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkpimexchange1-dev
 Section: libdevel
 Architecture: any
 Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
-Description: KDE PIM Exchange library [development]
+Description: TDE PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libkpimidentities1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE PIM user identity information library
- This library provides information to KDE programs about user identity,
+Description: TDE PIM user identity information library
+ This library provides information to TDE programs about user identity,
  such as email address, organization, etc.
  .
  This is the runtime package for programs that use the libkpimidentities
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libksieve0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE mail/news message filtering library
+Description: TDE mail/news message filtering library
  This is the runtime package for programs that use the libksieve library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libksieve0-dev
 Section: libdevel
 Architecture: any
 Depends: libksieve0 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
-Description: KDE mail/news message filtering library [development]
+Description: TDE mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve
  library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libktnef1
 Section: libs
@@ -625,8 +625,8 @@ Description: Library for handling KTNEF email attachments
  .
  This is the runtime library for packages using the ktnef library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libktnef1-dev
 Section: libdevel
@@ -642,8 +642,8 @@ Description: KTNEF handler library [development]
  This is the development package which contains the headers for the
  ktnef library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libmimelib1c2a
 Section: libs
@@ -651,23 +651,23 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a, libmimelib1c2
 Replaces: libmimelib1a, libmimelib1c2
-Description: KDE mime library
- This library is used by several KDE applications to handle mime types.
+Description: TDE mime library
+ This library is used by several TDE applications to handle mime types.
  .
  This is the runtime package for programs that use the libmimelib library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
 
 Package: libmimelib1-dev
 Section: libdevel
 Architecture: any
 Depends: libmimelib1c2a (= ${Source-Version})
-Description: KDE mime library [development]
- This library is used by several KDE applications to handle mime types.
+Description: TDE mime library [development]
+ This library is used by several TDE applications to handle mime types.
  .
  This is the development package which contains the headers for the
  libmimelib library.
  .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'tdepim' packages for more information.
+ This package is part of TDE, and a component of the TDE PIM module.
+ See the 'tde' and 'tdepim' packages for more information.
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
index 02504802f..f5a20268a 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
@@ -1,4 +1,4 @@
-?package(kaddressbook):\
+?package(kaddressbook-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu b/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
index a3c634694..51f8a28cc 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
@@ -1,4 +1,4 @@
-?package(kalarm):\
+?package(kalarm-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.menu b/ubuntu/maverick/tdepim/debian/kandy-trinity.menu
index f79c6188d..1e09fc9f5 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kandy-trinity.menu
@@ -1,4 +1,4 @@
-?package(kandy):\
+?package(kandy-trinity):\
 	needs="X11"\
 	section="Applications/Mobile Devices"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.menu b/ubuntu/maverick/tdepim/debian/karm-trinity.menu
index ed4af43be..1d7ae61a0 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/karm-trinity.menu
@@ -1,4 +1,4 @@
-?package(karm):\
+?package(karm-trinity):\
 	needs="X11"\
 	section="Applications/Project Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu b/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu
index e98f349a9..7630b49d8 100644
--- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu
@@ -1,11 +1,11 @@
-?package(kitchensync):\
+?package(kitchensync-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KitchenSync"\
 	command="/opt/trinity/bin/kitchensync"
 
-?package(kitchensync):\
+?package(kitchensync-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu
index f57f829b0..60e2714db 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu
@@ -1,11 +1,11 @@
-?package(kleopatra):\
+?package(kleopatra-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="Kleopatra"\
 	command="/opt/trinity/bin/kleopatra"
 
-?package(kleopatra):\
+?package(kleopatra-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu b/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
index f2c27bf83..fcee72213 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
@@ -1,4 +1,4 @@
-?package(kmail):\
+?package(kmail-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE,Mail"\
diff --git a/ubuntu/maverick/tdepim/debian/kmail.NEWS b/ubuntu/maverick/tdepim/debian/kmail.NEWS
index ad08f446a..730bd58b1 100644
--- a/ubuntu/maverick/tdepim/debian/kmail.NEWS
+++ b/ubuntu/maverick/tdepim/debian/kmail.NEWS
@@ -12,9 +12,9 @@ tdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
     and crash.  We don't have a solution to the bug at this time, but there is
     a workaround that doesn't result in any dataloss.
 
-    The folder $HOME/.kde/share/apps/kmail/imap/ holds cached copies of all
+    The folder $HOME/.trinity/share/apps/kmail/imap/ holds cached copies of all
     the mail headers in your imap account.  Deleting everything in this folder
-    (rm -rf ~/.kde/share/apps/kmail/imap/*) allows KMail to startup.  KMail
+    (rm -rf ~/.trinity/share/apps/kmail/imap/*) allows KMail to startup.  KMail
     will need to redownload all the mail headers, but it would need to do so
     anyway since it thinks the mail folders appearing under the inbox are
     different folders.
@@ -22,8 +22,8 @@ tdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
     In some cases even this workaround has not been enough.  If KMail still
     behaves strangely for you after doing this, you may need to move KMail's
     configuration file out of the way in addition to removing its IMAP cache.
-    To do this, "mv ~/.kde/share/config/kmailrc
-    ~/.kde/share/config/kmailrc.bak".  After doing this, KMail should behave
+    To do this, "mv ~/.trinity/share/config/kmailrc
+    ~/.trinity/share/config/kmailrc.bak".  After doing this, KMail should behave
     better, but you will need to reconfigure all of your accounts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 16 Dec 2006 13:48:33 -0500
diff --git a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu b/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
index 6f7a24a9e..964c7ecec 100644
--- a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
@@ -1,4 +1,4 @@
-?package(kmailcvt):\
+?package(kmailcvt-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE,Mail"\
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.menu b/ubuntu/maverick/tdepim/debian/knode-trinity.menu
index 5c5fdbe46..46d857c93 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/knode-trinity.menu
@@ -1,4 +1,4 @@
-?package(knode):\
+?package(knode-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE,News"\
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu b/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
index 6a16b329b..51a0e0ca5 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
@@ -1,4 +1,4 @@
-?package(knotes):\
+?package(knotes-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu b/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
index 631ad2ff2..671f98668 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
@@ -1,4 +1,4 @@
-?package(kontact):\
+?package(kontact-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu b/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
index 954c13991..aed196972 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
@@ -1,4 +1,4 @@
-?package(korganizer):\
+?package(korganizer-trinity):\
 	needs="X11"\
 	section="Applications/Data Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.menu b/ubuntu/maverick/tdepim/debian/korn-trinity.menu
index 7fbe02cee..2c656f159 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/korn-trinity.menu
@@ -1,4 +1,4 @@
-?package(korn):\
+?package(korn-trinity):\
 	needs="X11"\
 	section="Applications/Network/Web News"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu b/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
index 8b16ab8ae..38f214033 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
@@ -1,4 +1,4 @@
-?package(ktnef):\
+?package(ktnef-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man b/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man
index 5913cc461..cfbdd3348 100644
--- a/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man
@@ -1,12 +1,12 @@
 .TH AKREGATOR 1
 .SH NAME
-akregator \- a KDE RSS Aggregator
+akregator \- a TDE RSS Aggregator
 .SH SYNOPSIS
 .B akregator
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B Akregator
-is a KDE RSS aggregator with great look and feel.
+is a TDE RSS aggregator with great look and feel.
 .SH PROGRAM OPTIONS
 .TP
 .B -a, --addfeed \fI<url>\fB
diff --git a/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man
index 2ba3d8f79..2c6168cf3 100644
--- a/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man
@@ -1,9 +1,9 @@
 .TH EGROUPWAREWIZARD 1
 .SH NAME
-egroupwarewizard \- KDE eGroupware Wizard
+egroupwarewizard \- TDE eGroupware Wizard
 .SH SYNOPSIS
 .B egroupwarewizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B egroupwarewizard
 is a front end to configure eGroupware servers.
diff --git a/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man
index 87357e872..d077615f7 100644
--- a/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man
@@ -3,7 +3,7 @@
 exchangewizard \- MS Exchange Setup Wizard
 .SH SYNOPSIS
 .B exchangewizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B exchangewizard
 is a front end to configure Microsoft Exchange servers.
diff --git a/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man
index 9e6adf77b..bddeed88e 100644
--- a/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man
@@ -1,9 +1,9 @@
 .TH GROUPWAREWIZARD 1
 .SH NAME
-groupwarewizard \- KDE Groupware Wizard
+groupwarewizard \- TDE Groupware Wizard
 .SH SYNOPSIS
 .B groupwarewizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B groupwarewizard
 is a front end to configure eGroupware, Kolab, and SUSE Linux Openexchange
diff --git a/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man
index 947ea86e2..2bc201407 100644
--- a/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man
@@ -3,7 +3,7 @@
 groupwisewizard \- Novell GroupWise Setup Wizard
 .SH SYNOPSIS
 .B groupwisewizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B groupwisewizard
 is a front end to configure Novell GroupWise servers.
diff --git a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man b/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
index a2a85fd85..36fad6734 100644
--- a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
@@ -1,11 +1,11 @@
 .TH KADDRESSBOOK 1
 .SH NAME
-kaddressbook \- The KDE Address Book
+kaddressbook \- The TDE Address Book
 .SH SYNOPSIS
 .B kaddressbook
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
-\fBKAddressBook\fP is the main address book application for KDE; it enables
+\fBKAddressBook\fP is the main address book application for TDE; it enables
 you to manage your contacts efficiently and comfortably.  Since it is based
 on the tdeabc library it supports resources, which can be used to load and save
 your contacts to many different locations -- not just the local file system,
diff --git a/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man b/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man
index 71322519b..8aa59cc00 100644
--- a/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man
@@ -1,9 +1,9 @@
 .TH KALARM 1
 .SH NAME
-kalarm \- Personal alarm message, command and email scheduler for KDE
+kalarm \- Personal alarm message, command and email scheduler for TDE
 .SH SYNOPSIS
 .B kalarm
-.I [Qt-options] [KDE-options] [options] [message]
+.I [Qt-options] [TDE-options] [options] [message]
 .SH DESCRIPTION
 \fBKAlarm\fP is a personal alarm message, command and email scheduler. It
 lets you set up personal alarm messages which pop up on the screen at the
diff --git a/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man b/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man
index 4c639b377..051966dad 100644
--- a/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man
@@ -1,9 +1,9 @@
 .TH KALARMD 1
 .SH NAME
-kalarmd \- KDE alarm daemon
+kalarmd \- TDE alarm daemon
 .SH SYNOPSIS
 .B kalarmd
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B kalarmd
 runs in the background and handles displaying the events scheduled by
@@ -11,7 +11,7 @@ runs in the background and handles displaying the events scheduled by
 .SH PROGRAM OPTIONS
 .TP
 .B --autostart
-Application is being auto-started at KDE session start.
+Application is being auto-started at TDE session start.
 .so kdeopt.part
 .SH SEE ALSO
 .B kalarm
diff --git a/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man b/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man
index bcef93b4d..7f9d06c5f 100644
--- a/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man
@@ -3,14 +3,14 @@
 kandy \- Synchronize mobile phone address books
 .SH SYNOPSIS
 .B kandy
-.I [Qt-options] [KDE-options] [options] [profile]
+.I [Qt-options] [TDE-options] [options] [profile]
 .SH DESCRIPTION
 At the moment
 .B kandy
 is more or less a terminal program with some special features to store
 commands and their parameters, but it also has a simple GUI to access the
 phone book of a mobile phone and it is able to save this phone book to the
-KDE address book.
+TDE address book.
 
 .B kandy
 is aimed at mobile phones with integrate (GSM) modems.
diff --git a/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man b/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man
index 394366e0a..f36552f67 100644
--- a/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man
@@ -3,7 +3,7 @@
 kandy_client \- DCOP client for Kandy
 .SH SYNOPSIS
 .B kandy_client
-.I [Qt-options] [KDE-options] [URL]
+.I [Qt-options] [TDE-options] [URL]
 .SH DESCRIPTION
 .B kandy_client
 sends a URL to a running
diff --git a/ubuntu/maverick/tdepim/debian/man/karm-trinity.man b/ubuntu/maverick/tdepim/debian/man/karm-trinity.man
index f187d051f..18a1d52d3 100644
--- a/ubuntu/maverick/tdepim/debian/man/karm-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/karm-trinity.man
@@ -1,9 +1,9 @@
 .TH KARM 1
 .SH NAME
-karm \- KDE time tracker tool
+lkarm \- TDE time tracker tool
 .SH SYNOPSIS
 .B karm
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KArm
 tracks time spent on various tasks.  It is useful for tracking billable
diff --git a/ubuntu/maverick/tdepim/debian/man/kdeopt.part b/ubuntu/maverick/tdepim/debian/man/kdeopt.part
index e8fd346a6..661b4591d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kdeopt.part
+++ b/ubuntu/maverick/tdepim/debian/man/kdeopt.part
@@ -8,8 +8,8 @@ Show help about options.
 .B \-\-help-qt
 Show Qt specific options.
 .TP
-.B \-\-help-kde
-Show KDE specific options.
+.B \-\-help-tde
+Show TDE specific options.
 .TP
 .B \-\-help-all
 Show all options.
@@ -83,7 +83,7 @@ Set XIM server.
 .TP
 .B \-\-noxim
 Disable XIM.
-.SH KDE OPTIONS
+.SH TDE OPTIONS
 .TP
 .B \-\-caption \fI<caption>\fB
 Use `caption' as name in the titlebar.
diff --git a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man b/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man
index cd970e90b..548ca86ee 100644
--- a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man
@@ -1,9 +1,9 @@
 .TH KITCHENSYNC 1
 .SH NAME
-kitchensync \- Synchronize Data with KDE
+kitchensync \- Synchronize Data with TDE
 .SH SYNOPSIS
 .B kitchensync
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B kitchensync
 is a synchronization framework, still under heavy development.
diff --git a/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man b/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man
index ea7a7487d..67123a5b2 100644
--- a/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man
@@ -1,12 +1,12 @@
 .TH KLEOPATRA 1
 .SH NAME
-kleopatra \- KDE X.509 key manager
+kleopatra \- TDE X.509 key manager
 .SH SYNOPSIS
 .B kleopatra
-.I [Qt-options] [KDE-options] [options] [address|URL]
+.I [Qt-options] [TDE-options] [options] [address|URL]
 .SH DESCRIPTION
 .B Kleopatra
-is the KDE tool for managing X.509 certificates in the GpgSM keybox and for
+is the TDE tool for managing X.509 certificates in the GpgSM keybox and for
 retrieving certificates from LDAP servers.
 .SH PROGRAM OPTIONS
 .TP
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man b/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man
index 948462a5f..dbeebae4d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man
@@ -1,12 +1,12 @@
 .TH KMAIL 1
 .SH NAME
-kmail \- KDE email client
+kmail \- TDE email client
 .SH SYNOPSIS
 .B kmail
-.I [Qt-options] [KDE-options] [options] [address|URL]
+.I [Qt-options] [TDE-options] [options] [address|URL]
 .SH DESCRIPTION
 .B KMail
-is a fully-featured email client that fits nicely into the KDE desktop.
+is a fully-featured email client that fits nicely into the Trinity desktop.
 It has features such as support for IMAP, POP3, multiple accounts,
 mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
 .SH PROGRAM OPTIONS
diff --git a/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man b/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man
index f76bf7e7a..fc3c482c5 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man
@@ -3,7 +3,7 @@
 kmailcvt \- KMail import filters
 .SH SYNOPSIS
 .B kmailcvt
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B kmailcvt
 provides a frontend to import mail folders into \fBkmail\fP.  Supported
diff --git a/ubuntu/maverick/tdepim/debian/man/knode-trinity.man b/ubuntu/maverick/tdepim/debian/man/knode-trinity.man
index b237490c9..e4efa97f2 100644
--- a/ubuntu/maverick/tdepim/debian/man/knode-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/knode-trinity.man
@@ -1,13 +1,13 @@
 .TH KNODE 1
 .SH NAME
-knode \- KDE news reader
+knode \- TDE news reader
 .SH SYNOPSIS
 .B knode
-.I [Qt-options] [KDE-options] [url]
+.I [Qt-options] [TDE-options] [url]
 .SH DESCRIPTION
 .B KNode
 is an easy-to-use, convenient newsreader; it is intended to allow even
-newbies to use a newsreader under KDE, but it also offers advanced features
+newbies to use a newsreader under TDE, but it also offers advanced features
 appealing to experienced users.
 .SH PROGRAM OPTIONS
 .TP
diff --git a/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man b/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man
index 77380be9a..65db3e851 100644
--- a/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man
@@ -1,9 +1,9 @@
 .TH KNOTES 1
 .SH NAME
-knotes \- Sticky notes application for KDE
+knotes \- Sticky notes application for TDE
 .SH SYNOPSIS
 .B knotes
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KNotes
 is a program that lets you write the computer equivalent of sticky notes.
diff --git a/ubuntu/maverick/tdepim/debian/man/kode-trinity.man b/ubuntu/maverick/tdepim/debian/man/kode-trinity.man
index e737f5c31..1ddd9e2ef 100644
--- a/ubuntu/maverick/tdepim/debian/man/kode-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kode-trinity.man
@@ -1,9 +1,9 @@
 .TH KODE 1
 .SH NAME
-kode \- KDE code generator
+kode \- TDE code generator
 .SH SYNOPSIS
 .B kode
-.I [Qt-options] [KDE-options] [options] [filename]
+.I [Qt-options] [TDE-options] [options] [filename]
 .SH DESCRIPTION
 .B Kode
 generates various types of C++ template files.
diff --git a/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man
index 1329458ee..c008b9375 100644
--- a/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man
@@ -1,9 +1,9 @@
 .TH KOLABWIZARD 1
 .SH NAME
-kolabwizard \- KDE Kolab Wizard
+kolabwizard \- TDE Kolab Wizard
 .SH SYNOPSIS
 .B kolabwizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B kolabwizard
 is a front end to configure Kolab servers.
diff --git a/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man b/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man
index 7d8f7efab..9b75e205d 100644
--- a/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man
@@ -1,17 +1,17 @@
 .TH KONSOLEKALENDAR 1
 .SH NAME
-konsolekalendar \- Command line interface to KDE calendars
+konsolekalendar \- Command line interface to TDE calendars
 .SH SYNOPSIS
 .B konsolekalendar
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B KonsoleKalendar
-is a command line interface to KDE calendars.  It lets you view, insert,
+is a command line interface to TDE calendars.  It lets you view, insert,
 remove, or modify calendar events by way of the command line or from a
 scripting language.  Additionally,
 .B KonsoleKalendar
-can create a new KDE calendar, export a KDE calendar to a variety of other
-formats, and import another KDE calendar.
+can create a new TDE calendar, export a TDE calendar to a variety of other
+formats, and import another TDE calendar.
 .SH PROGRAM OPTIONS
 .TP
 .B --verbose
diff --git a/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man b/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man
index 3f712f1e6..f35c99557 100644
--- a/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man
@@ -1,13 +1,13 @@
 .TH KONTACT 1
 .SH NAME
-kontact \- Integrated KDE personal information management application
+kontact \- Integrated TDE personal information management application
 .SH SYNOPSIS
 .B kontact
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B Kontact
 is the integrated solution for personal information management.  It combines
-the well-known KDE applications for email, scheduling, address book, notes
+the well-known TDE applications for email, scheduling, address book, notes
 and newsgroups (KMail, KOrganizer, KAddressBook, KNotes and KNode) into a
 single interface.  Being based on a true component framework Kontact provides
 exactly the same functionality as the stand-alone applications, and adds
diff --git a/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man b/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man
index ced615aeb..8792a097f 100644
--- a/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man
@@ -3,7 +3,7 @@
 korgac \- KOrganizer alarm daemon
 .SH SYNOPSIS
 .B korgac
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B korgac
 runs in the background and handles displaying alarms from the KOrganizer
diff --git a/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man b/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man
index e11c28620..d8fd73ef4 100644
--- a/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man
@@ -1,12 +1,12 @@
 .TH KORGANIZER 1
 .SH NAME
-korganizer \- Personal organizer for KDE
+korganizer \- Personal organizer for TDE
 .SH SYNOPSIS
 .B korganizer
-.I [Qt-options] [KDE-options] [options] [calendar]
+.I [Qt-options] [TDE-options] [options] [calendar]
 .SH DESCRIPTION
 .B KOrganizer
-is a calendar application for KDE.  You can schedule appointments, events,
+is a calendar application for TDE.  You can schedule appointments, events,
 and to-do tasks.  KOrganizer will remind you about pending tasks, and help
 you keep your schedule.  It supports event categories, highlighting
 according to category, numerous options for generating repeated events,
diff --git a/ubuntu/maverick/tdepim/debian/man/korn-trinity.man b/ubuntu/maverick/tdepim/debian/man/korn-trinity.man
index 44e62c1a0..0f8ce9a05 100644
--- a/ubuntu/maverick/tdepim/debian/man/korn-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/korn-trinity.man
@@ -1,12 +1,12 @@
 .TH KORN 1
 .SH NAME
-korn \- Sticky notes application for KDE
+korn \- Sticky notes application for TDE
 .SH SYNOPSIS
 .B korn
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KOrn
-is a KDE mail checker that has the capability to dock itself to Kicker.
+is a TDE mail checker that has the capability to dock itself to Kicker.
 KOrn can check mbox, qmail, POP3, and Imap4 mailboxes, as well as nntp
 servers.  KOrn checks your mail on an interval that is user specified for
 each separate account.  Once mail is received you can have KOrn run a
diff --git a/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man b/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man
index 3bbfc16ea..5cc3f1352 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man
@@ -1,9 +1,9 @@
 .TH KPALMDOC 1
 .SH NAME
-kpalmdoc \- KDE converter for PalmDOC texts
+kpalmdoc \- TDE converter for PalmDOC texts
 .SH SYNOPSIS
 .B kpalmdoc
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KPalmDOC
 provides a user interface to converting between text files and PalmDOC files.
diff --git a/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man b/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man
index 923de2776..35ed2cb02 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man
@@ -1,15 +1,15 @@
 .TH KPILOT 1
 .SH NAME
-kpilot \- Palm Pilot synchronization software for KDE
+kpilot \- Palm Pilot synchronization software for TDE
 .SH SYNOPSIS
 .B kpilot
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B KPilot
 is an application that synchronizes a PalmPilot or similar device with
-the KDE desktop, much like the Palm Desktop HotSync software does for
+the Trinity desktop, much like the Palm Desktop HotSync software does for
 Windows.  KPilot can backup, restore, and HotSync your PalmPilot.  It can
-synchronize the built-in applications with their KDE counterparts.  It also
+synchronize the built-in applications with their TDE counterparts.  It also
 features additional conduits for third-party software.
 .SH PROGRAM OPTIONS
 .TP
diff --git a/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man b/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man
index c58a2065d..9965d9215 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man
@@ -3,7 +3,7 @@
 kpilotDaemon \- KPilot server
 .SH SYNOPSIS
 .B kpilotDaemon
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B kpilotDaemon
 is a program that runs in the background and handles the actual communication
diff --git a/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man b/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man
index c62365b1f..97e79bb5b 100644
--- a/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man
@@ -1,9 +1,9 @@
 .TH KSYNC 1
 .SH NAME
-ksync \- KDE synchronization framework
+ksync \- TDE synchronization framework
 .SH SYNOPSIS
 .B ksync
-.I [Qt-options] [KDE-options] [file]
+.I [Qt-options] [TDE-options] [file]
 .SH DESCRIPTION
 .B KSync
 allows you to synchronize calendar, bookmark, and address book data with
diff --git a/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man b/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man
index 8c1402996..091e5aab5 100644
--- a/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man
@@ -3,7 +3,7 @@
 ktnef \- TNEF file viewer
 .SH SYNOPSIS
 .B ktnef
-.I [Qt-options] [KDE-options] [file]
+.I [Qt-options] [TDE-options] [file]
 .SH DESCRIPTION
 .B Ktnef
 is an application for to view TNEF mail attachments.  These attachments are
diff --git a/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man b/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man
index fe9504b3b..421438434 100644
--- a/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man
@@ -3,7 +3,7 @@
 kwatchgnupg \- GnuPG log viewer
 .SH SYNOPSIS
 .B kwatchgnupg
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B KWatchGnuPG
 is a simple GnuPG log viewer for GnuPG.  It works as a GUI wrapper around
diff --git a/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man b/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man
index 90d7a0ea9..86dc0ad2d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man
@@ -1,9 +1,9 @@
 .TH KXML_COMPILER 1
 .SH NAME
-kxml_compiler \- KDE XML compiler
+kxml_compiler \- TDE XML compiler
 .SH SYNOPSIS
 .B kxml_compiler
-.I [Qt-options] [KDE-options] [options] dtd
+.I [Qt-options] [TDE-options] [options] dtd
 .SH DESCRIPTION
 .B kxml_compiler
 generates parsers and container classes for XML data described by
diff --git a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man b/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man
index ffcfa5fba..8b206a978 100644
--- a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man
@@ -1,15 +1,15 @@
 .TH MULTISYNK 1
 .SH NAME
-multisynk \- KDE synchronization application
+multisynk \- TDE synchronization application
 .SH SYNOPSIS
 .B multisynk
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B MultiSynk
-is a frontend for KDE's synchronization framework kitchensync.  This
+is a frontend for TDE's synchronization framework kitchensync.  This
 framework lets you synchronize a lot of mobile devices like handhelds
-and mobile phones with your KDE desktop, but also offers the possibility
-to synchronize two or more KDE desktops directly.
+and mobile phones with your Trinity desktop, but also offers the possibility
+to synchronize two or more Trinity desktops directly.
 .so kdeopt.part
 .SH SEE ALSO
 More detailed user documentation is available from
diff --git a/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man b/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man
index 2d2f4a1be..6ad679a01 100644
--- a/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man
@@ -3,10 +3,10 @@
 networkstatustestservice \- Test application for the NetworkStatus monitor
 .SH SYNOPSIS
 .B networkstatustestservice
-.I [Qt-options] [KDE-options]
+.I [Qt-options] [TDE-options]
 .SH DESCRIPTION
 .B networkstatustestservice
-sets up a test application for the KDE network status monitor.  After it
+sets up a test application for the TDE network status monitor.  After it
 starts, you can communicate with it using
 .B dcop
 (1).
diff --git a/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man b/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man
index 18235ce81..0fb0b2e78 100644
--- a/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man
@@ -1,9 +1,9 @@
 .TH SLOXWIZARD 1
 .SH NAME
-sloxwizard \- KDE Openexchange Wizard
+sloxwizard \- TDE Openexchange Wizard
 .SH SYNOPSIS
 .B sloxwizard
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
 .B sloxwizard
 is a front end to configure SUSE Linux Openexchange servers.
diff --git a/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man b/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
index d80289461..28be058df 100644
--- a/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
@@ -3,9 +3,9 @@
 tdeabc2mutt \- tdeabc to mutt converter
 .SH SYNOPSIS
 .B tdeabc2mutt
-.I [Qt-options] [KDE-options] [options]
+.I [Qt-options] [TDE-options] [options]
 .SH DESCRIPTION
-tdeabc2mutt converts the KDE address book's entries to Mutt format.
+tdeabc2mutt converts the TDE address book's entries to Mutt format.
 .SH PROGRAM OPTIONS
 .TP
 .B --query \fI<substring>\fB
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index a89f82f40..c2ad1a624 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-kaddressbook
 Title: The KAddressBook Handbook
 Author: Tobias Koenig, Steffen Hansen, Don Sanders
-Abstract: KAddressBook is the KDE address book.
+Abstract: KAddressBook is the TDE address book.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 12fc2dace..af8043280 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -2,7 +2,7 @@ Document: tdepim-doc-html-kalarm
 Title: The KAlarm Handbook
 Author: David Jarvie
 Abstract: KAlarm is a personal alarm message, command and email
- scheduler for KDE.
+ scheduler for TDE.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 4de6e31a5..5f1967e2a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-kmail
 Title: The KMail Handbook
 Author: Daniel Naber, David Rugge
-Abstract: KMail is KDE's powerful and user friendly email client.
+Abstract: KMail is TDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index 3ed0d42be..471967fad 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-konsolekalendar
 Title: The KonsoleKalendar Handbook
 Author: Tuukka Pasanen, Allen Winter
-Abstract: KonsoleKalendar is a command line interface to KDE calendars.
+Abstract: KonsoleKalendar is a command line interface to TDE calendars.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 74af7cbd4..6ec86e70d 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-kontact
 Title: The Kontact Handbook
 Author: Cornelius Schumacher
-Abstract: Kontact is a command line interface to KDE calendars.
+Abstract: Kontact is a command line interface to TDE calendars.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index 3256dc551..203443580 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-kpilot
 Title: The KPilot Handbook
 Author: Carlos Leonhard Woelz, Adriaan de Groot, Dan Pilone
-Abstract: KPilot is the KDE version of the Desktop HotSync software for
+Abstract: KPilot is the TDE version of the Desktop HotSync software for
  Palm Pilot handhelds.
 Section: Apps/Tools
 
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 830d874c1..74802a4f9 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -1,7 +1,7 @@
 Document: tdepim-doc-html-multisynk
 Title: The MultiSynk Handbook
 Author: Tobias Koenig
-Abstract: KDE synchronization application.
+Abstract: TDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
index 030d74014..8b8daf8e6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
@@ -1,39 +1,39 @@
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
 	title="EGroupware Setup Wizard"\
 	command="/opt/trinity/bin/egroupwarewizard"
 
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
 	title="MS Exchange Setup Wizard"\
 	command="/opt/trinity/bin/exchangewizard"
 
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
 	title="TDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
 	title="Novell GroupWise Setup Wizard"\
 	command="/opt/trinity/bin/groupwisewizard"
 
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
 	title="KOLab Setup Wizard"\
 	command="/opt/trinity/bin/kolabwizard"
 
-?package(tdepim-wizards):\
+?package(tdepim-wizards-trinity):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\