Branding cleanup on Debian and Ubuntu

38 files changed, 197 insertions, 197 deletions

diff --git a/debian/squeeze/applications/koffice/debian/README.MimeType b/debian/squeeze/applications/koffice/debian/README.MimeType
index 2e1b8cc4c..47949d713 100644
--- a/debian/squeeze/applications/koffice/debian/README.MimeType
+++ b/debian/squeeze/applications/koffice/debian/README.MimeType
@@ -7,7 +7,7 @@ similar to the following:
   koffice (lib kofficecore): ERROR: Couldn't find the native MimeType in
   kword's desktop file. Check your installation !
 
-This is often caused by an out-of-date KDE system configuration cache.
+This is often caused by an out-of-date TDE system configuration cache.
 If you experience this error, try running "tdebuildsycoca" and see if it
 fixes the problem.
 
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/versions.pl b/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
index d5c662a09..fae9524e7 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
@@ -1,4 +1,4 @@
-?package(chalk):\
+?package(chalk-trinity):\
 	needs="x11"\
 	section="Applications/Graphics"\
 	hints="TDE,Bitmap"\
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control
index e037369b6..185457e43 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/squeeze/applications/koffice/debian/control
@@ -16,8 +16,8 @@ Replaces: koffice-trinity (<< 4:14.0.0~)
 Breaks: koffice-trinity (<< 4:14.0.0~)
 Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
 Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
-Description: KDE Office Suite [Trinity]
- KOffice is an integrated office suite for KDE, the K Desktop
+Description: Trinity Office Suite [Trinity]
+ KOffice is an integrated office suite for TDE, the Trinity Desktop
  Environment.  It offers a word processor, spreadsheet, presentation
  program, graphics tools and more.
  .
@@ -28,11 +28,11 @@ Section: doc
 Architecture: all
 Replaces: koffice-trinity-doc (<< 4:14.0.0~)
 Breaks: koffice-trinity-doc (<< 4:14.0.0~)
-Description: developer documentation for the KDE Office Suite [Trinity]
- This package contains documentation for the KDE Office Suite, of
+Description: developer documentation for the Trinity Office Suite [Trinity]
+ This package contains documentation for the Trinity Office Suite, of
  use more for developers creating applications than regular users.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-doc-html
 Architecture: all
@@ -40,13 +40,13 @@ Section: doc
 Replaces: koffice-trinity-doc-html (<< 4:14.0.0~)
 Breaks: koffice-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, koffice-trinity
-Description: KDE Office Suite documentation in HTML format [Trinity]
- KOffice is an integrated office suite for KDE, the K Desktop
+Description: Trinity Office Suite documentation in HTML format [Trinity]
+ KOffice is an integrated office suite for TDE, the Trinity Desktop
  Environment.  It offers a word processor, spreadsheet, presentation
  program, graphics tools and more.
  .
  By default the KOffice applications only provide their documentation in
- KDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ TDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KOffice documentation converted to HTML
  format so it can be read with any web browser.
  .
@@ -54,40 +54,40 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/kword/.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: karbon-trinity
 Architecture: any
 Section: graphics
 Replaces: karbon-trinity (<< 4:14.0.0~)
 Breaks: karbon-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
-Description: a vector graphics application for the KDE Office Suite
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
+Description: a vector graphics application for the Trinity Office Suite
  Karbon is a vector graphics application.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kchart-trinity
 Architecture: any
 Section: tde
 Replaces: kchart-trinity (<< 4:14.0.0~)
 Breaks: kchart-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a chart drawing program for the KDE Office Suite [Trinity]
+Description: a chart drawing program for the Trinity Office Suite [Trinity]
  KChart is a chart drawing application.  It can be used to embed charts
  into KOffice documents.  KChart is easy to use and highly configurable.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kexi-trinity
 Architecture: any
 Section: tde
 Replaces: kexi-trinity (<< 4:14.0.0~)
 Breaks: kexi-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Suggests: kexi-mdb-plugin-trinity
-Description: integrated database environment for the KDE Office Suite [Trinity]
+Description: integrated database environment for the Trinity Office Suite [Trinity]
  Kexi is an integrated data management application. It can be used for
  creating database schemas, inserting data, performing queries, and
  processing data. Forms can be created to provide a custom interface to
@@ -100,16 +100,16 @@ Description: integrated database environment for the KDE Office Suite [Trinity]
  sufficiently powerful, inexpensive, open standards driven and portable
  across many operating systems and hardware platforms.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kformula-trinity
 Architecture: any
 Section: tde
 Replaces: kformula-trinity (<< 4:14.0.0~)
 Breaks: kformula-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a formula editor for the KDE Office Suite [Trinity]
+Description: a formula editor for the Trinity Office Suite [Trinity]
  KFormula is a formula editor that provides the basic input facilities
  and the support functionality expected of a KOffice application.
  .
@@ -117,20 +117,20 @@ Description: a formula editor for the KDE Office Suite [Trinity]
  movement, advanced syntax highlighting, multi-level undo support,
  LaTeX export and MathML import.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kivio-trinity
 Architecture: any
 Section: graphics
 Replaces: kivio-trinity (<< 4:14.0.0~)
 Breaks: kivio-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}~), kivio-data-trinity (<< ${KDE-Next-Version3}~), koffice-libs-trinity (<< ${KDE-Next-Version3}~)
-Description: a flowcharting program for the KDE Office Suite [Trinity]
+Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${TDE-Version3}~), kivio-data-trinity (<< ${TDE-Next-Version3}~), koffice-libs-trinity (<< ${TDE-Next-Version3}~)
+Description: a flowcharting program for the Trinity Office Suite [Trinity]
  Kivio is a flowcharting program that offers basic flowcharting abilities,
  but with a twist.  Objects are scriptable, and a backend plugin system
  offers the ability to make objects do just about anything.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kivio-data-trinity
 Architecture: all
@@ -139,37 +139,37 @@ Replaces: kivio-data-trinity (<< 4:14.0.0~)
 Breaks: kivio-data-trinity (<< 4:14.0.0~)
 Description: data files for Kivio flowcharting program [Trinity]
  This package contains architecture-independent data files for Kivio,
- the flowcharting program shipped with the KDE Office Suite.
+ the flowcharting program shipped with the Trinity Office Suite.
  .
  See the kivio package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koshell-trinity
 Architecture: any
 Section: tde
 Replaces: koshell-trinity (<< 4:14.0.0~)
 Breaks: koshell-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: the KDE Office Suite workspace [Trinity]
+Description: the Trinity Office Suite workspace [Trinity]
  The KOffice workspace is a desktop with easy one-click launchers for
  KOffice applications.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kplato-trinity
 Architecture: any
 Section: tde
 Replaces: kplato-trinity (<< 4:14.0.0~)
 Breaks: kplato-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: an integrated project management and planning tool [Trinity]
  KPlato is a project management application, allowing for the planning and
  scheduling of projects. It is in the very early stages of development.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 
 Package: kpresenter-trinity
@@ -177,14 +177,14 @@ Architecture: any
 Section: tde
 Replaces: kpresenter-trinity (<< 4:14.0.0~)
 Breaks: kpresenter-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}~), kpresenter-data-trinity (<< ${KDE-Next-Version3}~), koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${TDE-Version3}~), kpresenter-data-trinity (<< ${TDE-Next-Version3}~), koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a presentation program for the KDE Office Suite [Trinity]
+Description: a presentation program for the Trinity Office Suite [Trinity]
  KPresenter is a fully-featured presentation program.  Presentations can
  be edited directly within KPresenter, and many advanced features for
  screen presentations are available.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kpresenter-data-trinity
 Architecture: all
@@ -193,24 +193,24 @@ Replaces: kpresenter-data-trinity (<< 4:14.0.0~)
 Breaks: kpresenter-data-trinity (<< 4:14.0.0~)
 Description: data files for KPresenter presentation program [Trinity]
  This package contains architecture-independent data files for KPresenter,
- the presentation program shipped with the KDE Office Suite.
+ the presentation program shipped with the Trinity Office Suite.
  .
  See the kpresenter package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: chalk-trinity
 Architecture: any
 Section: tde
 Replaces: krita-trinity (<< 4:14.0.0~), chalk-trinity (<< 4:14.0.0~)
 Breaks: krita-trinity (<< 4:14.0.0~), chalk-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}~), chalk-data-trinity (<< ${KDE-Next-Version3}~), koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${TDE-Version3}~), chalk-data-trinity (<< ${TDE-Next-Version3}~), koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity]
+Description: a pixel-based image manipulation program for the Trinity Office Suite [Trinity]
  Chalk is a painting and image editing application for KOffice. Chalk contains
  both ease-of-use and fun features like guided painting.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: chalk-data-trinity
 Architecture: all
@@ -219,56 +219,56 @@ Replaces: krita-data-trinity (<< 4:14.0.0~), chalk-data-trinity (<< 4:14.0.0~)
 Breaks: krita-data-trinity (<< 4:14.0.0~), chalk-data-trinity (<< 4:14.0.0~)
 Description: data files for Chalk painting program [Trinity]
  This package contains architecture-independent data files for Chalk,
- the painting program shipped with the KDE Office Suite.
+ the painting program shipped with the Trinity Office Suite.
  .
  See the chalk package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kspread-trinity
 Architecture: any
 Section: tde
 Replaces: kspread-trinity (<< 4:14.0.0~)
 Breaks: kspread-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a spreadsheet for the KDE Office Suite [Trinity]
+Description: a spreadsheet for the Trinity Office Suite [Trinity]
  KSpread is a powerful spreadsheet application.  It is scriptable and
  provides both table-oriented sheets and support for complex mathematical
  formulae and statistics.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kugar-trinity
 Architecture: any
 Section: tde
 Replaces: kugar-trinity (<< 4:14.0.0~)
 Breaks: kugar-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a business report maker for the KDE Office Suite [Trinity]
+Description: a business report maker for the Trinity Office Suite [Trinity]
  Kugar is a tool for generating business quality reports that can
  be viewed and printed.  It includes a standalone report viewer and a
- KPart report viewer.  The latter means that any KDE application can
+ KPart report viewer.  The latter means that any TDE application can
  embed the report viewing functionality and that reports can be viewed
  using the Konqueror browser.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kword-trinity
 Architecture: any
 Section: tde
 Replaces: kword-trinity (<< 4:14.0.0~)
 Breaks: kword-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}~), kword-data-trinity (<< ${KDE-Next-Version3}~), koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, kword-data-trinity (>> ${TDE-Version3}~), kword-data-trinity (<< ${TDE-Next-Version3}~), koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a word processor for the KDE Office Suite [Trinity]
+Description: a word processor for the Trinity Office Suite [Trinity]
  KWord is a FrameMaker-like word processing and desktop publishing
  application.  KWord is capable of creating demanding and professional
  looking documents.  It can be used for desktop publishing, but also for
  "normal" word processing, like writing letters, reports and so on.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kword-data-trinity
 Architecture: all
@@ -277,39 +277,39 @@ Replaces: kword-data-trinity (<< 4:14.0.0~)
 Breaks: kword-data-trinity (<< 4:14.0.0~)
 Description: data files for KWord word processor [Trinity]
  This package contains architecture-independent data files for KWord,
- the word processor shipped with the KDE Office Suite.
+ the word processor shipped with the Trinity Office Suite.
  .
  See the kword package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kthesaurus-trinity
 Architecture: any
 Section: tde
 Replaces: kthesaurus-trinity (<< 4:14.0.0~)
 Breaks: kthesaurus-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3}~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: thesaurus for the KDE Office Suite [Trinity]
+Description: thesaurus for the Trinity Office Suite [Trinity]
  KThesaurus lists words related to a given term and offers a user interface
  to WordNet, a powerful lexical reference system. By default, only the English
  language is supported.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-libs-trinity
 Architecture: any
 Section: libs
 Replaces: koffice-libs-trinity (<< 4:14.0.0~)
 Breaks: koffice-libs-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}~), koffice-data-trinity (<< ${KDE-Next-Version3}~)
+Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~)
 Recommends: latex-xft-fonts, ruby, python
 Suggests: wordnet, texlive-base
-Description: common libraries and binaries for the KDE Office Suite [Trinity]
+Description: common libraries and binaries for the Trinity Office Suite [Trinity]
  This package provides the libraries and binaries that are shared amongst
  the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-data-trinity
 Architecture: all
@@ -317,11 +317,11 @@ Section: libs
 Replaces: koffice-data-trinity (<< 4:14.0.0~)
 Breaks: koffice-data-trinity (<< 4:14.0.0~)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html
-Description: common shared data for the KDE Office Suite [Trinity]
+Description: common shared data for the Trinity Office Suite [Trinity]
  This package provides the architecture-independent data that is shared
  amongst the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-dev
 Architecture: any
@@ -333,7 +333,7 @@ Description: common libraries for KOffice (development files) [Trinity]
  This package provides the development files for the libraries that are
  shared amongst the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-dbg
 Section: libdevel
diff --git a/debian/squeeze/applications/koffice/debian/control.in b/debian/squeeze/applications/koffice/debian/control.in
index 7199c71e6..fa0759841 100644
--- a/debian/squeeze/applications/koffice/debian/control.in
+++ b/debian/squeeze/applications/koffice/debian/control.in
@@ -14,8 +14,8 @@ Architecture: all
 Section: tde
 Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
 Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
-Description: KDE Office Suite [Trinity]
- KOffice is an integrated office suite for KDE, the K Desktop
+Description: Trinity Office Suite [Trinity]
+ KOffice is an integrated office suite for TDE, the Trinity Desktop
  Environment.  It offers a word processor, spreadsheet, presentation
  program, graphics tools and more.
  .
@@ -24,23 +24,23 @@ Description: KDE Office Suite [Trinity]
 Package: koffice-trinity-doc
 Section: doc
 Architecture: all
-Description: developer documentation for the KDE Office Suite [Trinity]
- This package contains documentation for the KDE Office Suite, of
+Description: developer documentation for the Trinity Office Suite [Trinity]
+ This package contains documentation for the Trinity Office Suite, of
  use more for developers creating applications than regular users.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, koffice-trinity
-Description: KDE Office Suite documentation in HTML format [Trinity]
- KOffice is an integrated office suite for KDE, the K Desktop
+Description: Trinity Office Suite documentation in HTML format [Trinity]
+ KOffice is an integrated office suite for TDE, the Trinity Desktop
  Environment.  It offers a word processor, spreadsheet, presentation
  program, graphics tools and more.
  .
  By default the KOffice applications only provide their documentation in
- KDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ TDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KOffice documentation converted to HTML
  format so it can be read with any web browser.
  .
@@ -48,34 +48,34 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/kword/.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: karbon-trinity
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
-Description: a vector graphics application for the KDE Office Suite
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
+Description: a vector graphics application for the Trinity Office Suite
  Karbon is a vector graphics application.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kchart-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a chart drawing program for the KDE Office Suite [Trinity]
+Description: a chart drawing program for the Trinity Office Suite [Trinity]
  KChart is a chart drawing application.  It can be used to embed charts
  into KOffice documents.  KChart is easy to use and highly configurable.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kexi-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Suggests: kexi-mdb-plugin-trinity
-Description: integrated database environment for the KDE Office Suite [Trinity]
+Description: integrated database environment for the Trinity Office Suite [Trinity]
  Kexi is an integrated data management application. It can be used for
  creating database schemas, inserting data, performing queries, and
  processing data. Forms can be created to provide a custom interface to
@@ -88,14 +88,14 @@ Description: integrated database environment for the KDE Office Suite [Trinity]
  sufficiently powerful, inexpensive, open standards driven and portable
  across many operating systems and hardware platforms.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kformula-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a formula editor for the KDE Office Suite [Trinity]
+Description: a formula editor for the Trinity Office Suite [Trinity]
  KFormula is a formula editor that provides the basic input facilities
  and the support functionality expected of a KOffice application.
  .
@@ -103,181 +103,181 @@ Description: a formula editor for the KDE Office Suite [Trinity]
  movement, advanced syntax highlighting, multi-level undo support,
  LaTeX export and MathML import.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kivio-trinity
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}), kivio-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
-Description: a flowcharting program for the KDE Office Suite [Trinity]
+Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${TDE-Version3}), kivio-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
+Description: a flowcharting program for the Trinity Office Suite [Trinity]
  Kivio is a flowcharting program that offers basic flowcharting abilities,
  but with a twist.  Objects are scriptable, and a backend plugin system
  offers the ability to make objects do just about anything.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kivio-data-trinity
 Architecture: all
 Section: graphics
 Description: data files for Kivio flowcharting program [Trinity]
  This package contains architecture-independent data files for Kivio,
- the flowcharting program shipped with the KDE Office Suite.
+ the flowcharting program shipped with the Trinity Office Suite.
  .
  See the kivio package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koshell-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: the KDE Office Suite workspace [Trinity]
+Description: the Trinity Office Suite workspace [Trinity]
  The KOffice workspace is a desktop with easy one-click launchers for
  KOffice applications.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kplato-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: an integrated project management and planning tool [Trinity]
  KPlato is a project management application, allowing for the planning and
  scheduling of projects. It is in the very early stages of development.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 
 Package: kpresenter-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}), kpresenter-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${TDE-Version3}), kpresenter-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a presentation program for the KDE Office Suite [Trinity]
+Description: a presentation program for the Trinity Office Suite [Trinity]
  KPresenter is a fully-featured presentation program.  Presentations can
  be edited directly within KPresenter, and many advanced features for
  screen presentations are available.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kpresenter-data-trinity
 Architecture: all
 Section: tde
 Description: data files for KPresenter presentation program [Trinity]
  This package contains architecture-independent data files for KPresenter,
- the presentation program shipped with the KDE Office Suite.
+ the presentation program shipped with the Trinity Office Suite.
  .
  See the kpresenter package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: chalk-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}), chalk-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${TDE-Version3}), chalk-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity]
+Description: a pixel-based image manipulation program for the Trinity Office Suite [Trinity]
  Chalk is a painting and image editing application for KOffice. Chalk contains
  both ease-of-use and fun features like guided painting.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: chalk-data-trinity
 Architecture: all
 Section: tde
 Description: data files for Chalk painting program [Trinity]
  This package contains architecture-independent data files for Chalk,
- the painting program shipped with the KDE Office Suite.
+ the painting program shipped with the Trinity Office Suite.
  .
  See the chalk package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kspread-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a spreadsheet for the KDE Office Suite [Trinity]
+Description: a spreadsheet for the Trinity Office Suite [Trinity]
  KSpread is a powerful spreadsheet application.  It is scriptable and
  provides both table-oriented sheets and support for complex mathematical
  formulae and statistics.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kugar-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a business report maker for the KDE Office Suite [Trinity]
+Description: a business report maker for the Trinity Office Suite [Trinity]
  Kugar is a tool for generating business quality reports that can
  be viewed and printed.  It includes a standalone report viewer and a
- KPart report viewer.  The latter means that any KDE application can
+ KPart report viewer.  The latter means that any TDE application can
  embed the report viewing functionality and that reports can be viewed
  using the Konqueror browser.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kword-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}), kword-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, kword-data-trinity (>> ${TDE-Version3}), kword-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a word processor for the KDE Office Suite [Trinity]
+Description: a word processor for the Trinity Office Suite [Trinity]
  KWord is a FrameMaker-like word processing and desktop publishing
  application.  KWord is capable of creating demanding and professional
  looking documents.  It can be used for desktop publishing, but also for
  "normal" word processing, like writing letters, reports and so on.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kword-data-trinity
 Architecture: all
 Section: tde
 Description: data files for KWord word processor [Trinity]
  This package contains architecture-independent data files for KWord,
- the word processor shipped with the KDE Office Suite.
+ the word processor shipped with the Trinity Office Suite.
  .
  See the kword package for further information.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: kthesaurus-trinity
 Architecture: any
 Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: thesaurus for the KDE Office Suite [Trinity]
+Description: thesaurus for the Trinity Office Suite [Trinity]
  KThesaurus lists words related to a given term and offers a user interface
  to WordNet, a powerful lexical reference system. By default, only the English
  language is supported.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-libs-trinity
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}), koffice-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}), koffice-data-trinity (<< ${TDE-Next-Version3})
 Recommends: latex-xft-fonts, ruby, python
 Suggests: wordnet, texlive-base
-Description: common libraries and binaries for the KDE Office Suite [Trinity]
+Description: common libraries and binaries for the Trinity Office Suite [Trinity]
  This package provides the libraries and binaries that are shared amongst
  the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-data-trinity
 Architecture: all
 Section: libs
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html
-Description: common shared data for the KDE Office Suite [Trinity]
+Description: common shared data for the Trinity Office Suite [Trinity]
  This package provides the architecture-independent data that is shared
  amongst the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-dev
 Architecture: any
@@ -287,7 +287,7 @@ Description: common libraries for KOffice (development files) [Trinity]
  This package provides the development files for the libraries that are
  shared amongst the various components of KOffice.
  .
- This package is part of the KDE Office Suite.
+ This package is part of the Trinity Office Suite.
 
 Package: koffice-trinity-dbg
 Section: libdevel
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
index b44ea5b50..e04f3c6c6 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
@@ -1,4 +1,4 @@
-?package(karbon):\
+?package(karbon-trinity):\
 	needs="x11"\
 	section="Applications/Graphics"\
 	hints="TDE,Vector"\
diff --git a/debian/squeeze/applications/koffice/debian/karbon.1 b/debian/squeeze/applications/koffice/debian/karbon.1
index fa077706a..6a4cbb8ef 100644
--- a/debian/squeeze/applications/koffice/debian/karbon.1
+++ b/debian/squeeze/applications/koffice/debian/karbon.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-karbon \- a vector graphics application for the KDE Office Suite
+karbon \- a vector graphics application for the Trinity Office Suite
 .SH SYNOPSIS
 .B karbon
 [ \fIgeneric-options\fP ]
@@ -25,10 +25,10 @@ karbon \- a vector graphics application for the KDE Office Suite
 .SH DESCRIPTION
 \fBKarbon\fP is a vector graphics application.
 .PP
-Note that the KDE Office Suite comes with two graphics applications \-
+Note that the Trinity Office Suite comes with two graphics applications \-
 Kontour (which is vector-based) and Chalk (which is raster-based).
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the karbon-specific options.
 For a full summary of options, run \fIkarbon \-\-help\fP.
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian
index ab998f150..5caeb12aa 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian
@@ -1,7 +1,7 @@
 KChart for Debian
 -----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
index 5939ec5d4..26e7aebf0 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
@@ -1,4 +1,4 @@
-?package(kchart):\
+?package(kchart-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE,Graphs"\
diff --git a/debian/squeeze/applications/koffice/debian/kchart.1 b/debian/squeeze/applications/koffice/debian/kchart.1
index 0b2c8a4c3..367f2e7ab 100644
--- a/debian/squeeze/applications/koffice/debian/kchart.1
+++ b/debian/squeeze/applications/koffice/debian/kchart.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kchart \- a chart drawing program for the KDE Office Suite
+kchart \- a chart drawing program for the Trinity Office Suite
 .SH SYNOPSIS
 .B kchart
 [ \fIgeneric-options\fP ]
@@ -26,7 +26,7 @@ kchart \- a chart drawing program for the KDE Office Suite
 \fBKChart\fP is a chart drawing application.  It can be used to embed charts
 into KOffice documents.  KChart is easy to use and highly configurable.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kchart-specific options.
 For a full summary of options, run \fIkchart \-\-help\fP.
@@ -34,14 +34,14 @@ For a full summary of options, run \fIkchart \-\-help\fP.
 \fB\-\-print\fP
 Print the given file(s) and exit.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kchart/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kchart/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kchart/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian
index bfd5bb7e5..fd4cb53d6 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian
@@ -10,7 +10,7 @@ Settings -> Configure KFormula, and under Font Style select
 "Computer modern (TeX) style".
 
 Note also that this application provides documentation in a docbook
-format that the KDE Help Centre can display.  For HTML documentation
+format that the TDE Help Centre can display.  For HTML documentation
 that can be read in any web browser, see the package koffice-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sun,  9 May 2004 11:33:00 +1000
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.menu b/debian/squeeze/applications/koffice/debian/kformula-trinity.menu
index 64a4489bb..e54e6bebd 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kformula-trinity.menu
@@ -1,4 +1,4 @@
-?package(kformula):\
+?package(kformula-trinity):\
 	needs="x11"\
 	section="Applications/Science/Mathematics"\
 	hints="TDE"\
diff --git a/debian/squeeze/applications/koffice/debian/kformula.1 b/debian/squeeze/applications/koffice/debian/kformula.1
index 801df0727..ebbd55afb 100644
--- a/debian/squeeze/applications/koffice/debian/kformula.1
+++ b/debian/squeeze/applications/koffice/debian/kformula.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kformula \- a formula editor for the KDE Office Suite
+kformula \- a formula editor for the Trinity Office Suite
 .SH SYNOPSIS
 .B kformula
 [ \fIgeneric-options\fP ]
@@ -44,7 +44,7 @@ KFormula uses the KOffice formula drawing library. If you have to deal
 with many formulae you may wish to use a KFormula object embedded in
 KWord or KSpread.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kformula-specific options.
 For a full summary of options, run \fIkformula \-\-help\fP.
@@ -55,14 +55,14 @@ Print the given file(s) and exit.
 .BR kword (1),
 .BR kspread (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kformula/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kformula/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kformula/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
index ea5177019..46a18fe91 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
@@ -1,4 +1,4 @@
-?package(kivio):\
+?package(kivio-trinity):\
 	needs="x11"\
 	section="Applications/Graphics"\
 	hints="TDE,Vector"\
diff --git a/debian/squeeze/applications/koffice/debian/kivio.1 b/debian/squeeze/applications/koffice/debian/kivio.1
index 0ae1aa215..b6557f54f 100644
--- a/debian/squeeze/applications/koffice/debian/kivio.1
+++ b/debian/squeeze/applications/koffice/debian/kivio.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kivio \- a flowcharting program for the KDE Office Suite
+kivio \- a flowcharting program for the Trinity Office Suite
 .SH SYNOPSIS
 .B kivio
 [ \fIgeneric-options\fP ]
@@ -27,7 +27,7 @@ kivio \- a flowcharting program for the KDE Office Suite
 abilities, but with a twist.  Objects are scriptable, and a backend plugin
 system offers the ability to make objects do just about anything.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kivio-specific options.
 For a full summary of options, run \fIkivio \-\-help\fP.
diff --git a/debian/squeeze/applications/koffice/debian/koconverter.1 b/debian/squeeze/applications/koffice/debian/koconverter.1
index 95eab71a2..07529ada9 100644
--- a/debian/squeeze/applications/koffice/debian/koconverter.1
+++ b/debian/squeeze/applications/koffice/debian/koconverter.1
@@ -27,7 +27,7 @@ koconverter \- convert between office suite file formats
 KOffice import and export filters to convert from any file format
 that is understood by KOffice to any other.
 .PP
-This tool is part of the KDE Office Suite.
+This tool is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the koconverter-specific options.  For a full summary of options,
 run \fIkoconverter \-\-help\fP.
diff --git a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian
index eb49daa16..fc37e6fb8 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian
@@ -1,7 +1,7 @@
-KDE Office Suite for Debian
+Trinity Office Suite for Debian
 ---------------------------
 
-This package provides documentation in a docbook format that the KDE
+This package provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index f6b06085b..4244bd9aa 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
@@ -1,8 +1,8 @@
 Document: koffice-doc-html-koffice
 Title: KOffice - A General Introduction
 Author: Jost Schenck <jost@schenck.de>
-Abstract: KOffice is an integrated office suite for the K Desktop
- Environment (KDE).
+Abstract: KOffice is an integrated office suite for the Trinity Desktop
+ Environment (TDE).
 Section: Office
 
 Format: HTML
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian
index 7d5f525a3..d463d8fd2 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian
@@ -1,10 +1,10 @@
-KDE Office Suite for Debian
+Trinity Office Suite for Debian
 ---------------------------
 
 Package koffice is a metapackage that depends on the core components of
-the KDE Office Suite and suggests the remaining components.
+the Trinity Office Suite and suggests the remaining components.
 
-Each application provides documentation in a docbook format that the KDE
+Each application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/koscript.1 b/debian/squeeze/applications/koffice/debian/koscript.1
index 9517c3f74..419c52df0 100644
--- a/debian/squeeze/applications/koffice/debian/koscript.1
+++ b/debian/squeeze/applications/koffice/debian/koscript.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-koscript \- a script interpreter for the KDE Office Suite
+koscript \- a script interpreter for the Trinity Office Suite
 .SH SYNOPSIS
 .B koscript
 [ \fIgeneric-options\fP ]
@@ -25,7 +25,7 @@ koscript \- a script interpreter for the KDE Office Suite
 \fBKOScript\fP is the KOffice script interpreter.  It is used to run the
 given KOffice script.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the koscript-specific options.  For a full summary of options,
 run \fIkoscript \-\-help\fP.
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.menu b/debian/squeeze/applications/koffice/debian/koshell-trinity.menu
index dec271e06..5b4872d0f 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/koshell-trinity.menu
@@ -1,4 +1,4 @@
-?package(koshell):\
+?package(koshell-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE"\
diff --git a/debian/squeeze/applications/koffice/debian/koshell.1 b/debian/squeeze/applications/koffice/debian/koshell.1
index 2213dc554..d1dc76870 100644
--- a/debian/squeeze/applications/koffice/debian/koshell.1
+++ b/debian/squeeze/applications/koffice/debian/koshell.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-koshell \- the KDE Office Suite workspace
+koshell \- the Trinity Office Suite workspace
 .SH SYNOPSIS
 .B koshell
 .RI "[ " generic-options " ]"
@@ -24,7 +24,7 @@ koshell \- the KDE Office Suite workspace
 \fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
 launchers for KOffice applications.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 For a full summary of options, run \fIkoshell \-\-help\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kprconverter.pl.1 b/debian/squeeze/applications/koffice/debian/kprconverter.pl.1
index bd6bdfd66..635cc9556 100644
--- a/debian/squeeze/applications/koffice/debian/kprconverter.pl.1
+++ b/debian/squeeze/applications/koffice/debian/kprconverter.pl.1
@@ -29,7 +29,7 @@ converted XML data to \fInew-XML\fP.
 The XML data stored in a KPresenter document can be accessed by passing
 the \fB.kpr\fP document through gunzip.
 .PP
-This utility is part of the KDE Office Suite.
+This utility is part of the Trinity Office Suite.
 .SH NOTES
 Be aware that \fIold-XML\fP should not be the
 original \fB.kpr\fP document, but should
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian
index d1142abfb..fb9aa4fc5 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian
@@ -1,7 +1,7 @@
 KPresenter for Debian
 ---------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
index dda510fcf..1de44f297 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpresenter):\
+?package(kpresenter-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE,Presentation"\
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter.1 b/debian/squeeze/applications/koffice/debian/kpresenter.1
index 7eb96d7f2..08eddd41e 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter.1
+++ b/debian/squeeze/applications/koffice/debian/kpresenter.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kpresenter \- a presentation program for the KDE Office Suite
+kpresenter \- a presentation program for the Trinity Office Suite
 .SH SYNOPSIS
 .B kpresenter
 [ \fIgeneric-options\fP ]
@@ -27,7 +27,7 @@ kpresenter \- a presentation program for the KDE Office Suite
 be edited directly within KPresenter, and many advanced features for
 screen presentations are available.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kpresenter-specific options.
 For a full summary of options, run \fIkpresenter \-\-help\fP.
@@ -35,14 +35,14 @@ For a full summary of options, run \fIkpresenter \-\-help\fP.
 \fB\-\-print\fP
 Print the given file(s) and exit.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kpresenter/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kpresenter/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian
index 697074b1e..ba2b10611 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian
@@ -1,7 +1,7 @@
 KSpread for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
index d3cec2c14..995876a1e 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
@@ -1,4 +1,4 @@
-?package(kspread):\
+?package(kspread-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE,Spreadsheets"\
diff --git a/debian/squeeze/applications/koffice/debian/kspread.1 b/debian/squeeze/applications/koffice/debian/kspread.1
index 3ae324559..0cf7e8861 100644
--- a/debian/squeeze/applications/koffice/debian/kspread.1
+++ b/debian/squeeze/applications/koffice/debian/kspread.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kspread \- a spreadsheet for the KDE Office Suite
+kspread \- a spreadsheet for the Trinity Office Suite
 .SH SYNOPSIS
 .B kspread
 [ \fIgeneric-options\fP ]
@@ -27,7 +27,7 @@ kspread \- a spreadsheet for the KDE Office Suite
 provides both table-oriented sheets and support for complex mathematical
 formulae and statistics.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kspread-specific options.
 For a full summary of options, run \fIkspread \-\-help\fP.
@@ -37,14 +37,14 @@ Print the given file(s) and exit.
 .SH SEE ALSO
 .BR kformula (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kspread/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kspread/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kspread/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu
index a11667fe3..66b591d6d 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu
@@ -1,4 +1,4 @@
-?package(kthesaurus):\
+?package(kthesaurus-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE"\
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus.1 b/debian/squeeze/applications/koffice/debian/kthesaurus.1
index f5fba2153..32f929bb8 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus.1
+++ b/debian/squeeze/applications/koffice/debian/kthesaurus.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kthesaurus \- a thesaurus for the KDE Office Suite
+kthesaurus \- a thesaurus for the Trinity Office Suite
 .SH SYNOPSIS
 .B kthesaurus
 [ \fIgeneric-options\fP ] [ \fIterm\fP ]
@@ -29,20 +29,20 @@ Only the English language is supported.
 .PP
 A term to search for may be optionally specified on the command-line.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 For a full summary of options, run \fIkthesaurus \-\-help\fP.
 .SH SEE ALSO
 .BR kword (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/thesaurus/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/thesaurus/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kudesigner.1 b/debian/squeeze/applications/koffice/debian/kudesigner.1
index b293d0016..bb08bb355 100644
--- a/debian/squeeze/applications/koffice/debian/kudesigner.1
+++ b/debian/squeeze/applications/koffice/debian/kudesigner.1
@@ -28,7 +28,7 @@ Kugar, the business report maker for KOffice.  Templates (which describe
 the layout of the data within a report) can be created in a visual
 drag-and-drop manner and then saved to file.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kudesigner-specific options.
 For a full summary of options, run \fIkudesigner \-\-help\fP.
@@ -38,14 +38,14 @@ Print the given file(s) and exit.
 .SH SEE ALSO
 .BR kugar (1).
 .PP
-Full user documentation for Kugar is available through the KDE Help Centre.
+Full user documentation for Kugar is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kugar/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kugar/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian
index fd3e6b053..1e7fd65ce 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kugar for Debian
 ----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.menu b/debian/squeeze/applications/koffice/debian/kugar-trinity.menu
index 68027f023..2adf48e3f 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kugar-trinity.menu
@@ -1,4 +1,4 @@
-?package(kugar):\
+?package(kugar-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon="/opt/trinity/share/pixmaps/kugar.xpm"\
 	command="/opt/trinity/bin/kugar"
 
-?package(kugar):\
+?package(kugar-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE"\
diff --git a/debian/squeeze/applications/koffice/debian/kugar.1 b/debian/squeeze/applications/koffice/debian/kugar.1
index c3903a3d1..134747aa2 100644
--- a/debian/squeeze/applications/koffice/debian/kugar.1
+++ b/debian/squeeze/applications/koffice/debian/kugar.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kugar \- a business report maker for the KDE Office Suite
+kugar \- a business report maker for the Trinity Office Suite
 .SH SYNOPSIS
 .B kugar
 [ \fIgeneric-options\fP ]
@@ -25,7 +25,7 @@ kugar \- a business report maker for the KDE Office Suite
 .SH DESCRIPTION
 \fBKugar\fP is a tool for generating business quality reports that can
 be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any KDE application can
+KPart report viewer.  The latter means that any TDE application can
 embed the report viewing functionality and that reports can be viewed
 using the Konqueror browser.
 .PP
@@ -40,7 +40,7 @@ Template files typically end in \fB.kut\fP.  See
 .BR kudesigner (1)
 for a tool for creating template files.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kugar-specific options.
 For a full summary of options, run \fIkugar \-\-help\fP.
@@ -50,14 +50,14 @@ Print the given file(s) and exit.
 .SH SEE ALSO
 .BR kudesigner (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kugar/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kugar/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian b/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian
index 14ad609c3..8f0cd5492 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian
@@ -1,7 +1,7 @@
 KWord for Debian
 ----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package koffice-doc-html.
 
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.menu b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
index ce452d45d..629d327e4 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
@@ -1,4 +1,4 @@
-?package(kword):\
+?package(kword-trinity):\
 	needs="x11"\
 	section="Applications/Office"\
 	hints="TDE,Word processors"\
diff --git a/debian/squeeze/applications/koffice/debian/kword.1 b/debian/squeeze/applications/koffice/debian/kword.1
index c191e2978..e55e7f5f3 100644
--- a/debian/squeeze/applications/koffice/debian/kword.1
+++ b/debian/squeeze/applications/koffice/debian/kword.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kword \- a word processor for the KDE Office Suite
+kword \- a word processor for the Trinity Office Suite
 .SH SYNOPSIS
 .B kword
 [ \fIgeneric-options\fP ]
@@ -28,7 +28,7 @@ application.  KWord is capable of creating demanding and professional
 looking documents.  It can be used for desktop publishing, but also for
 "normal" word processing, like writing letters, reports and so on.
 .PP
-This application is part of the KDE Office Suite.
+This application is part of the Trinity Office Suite.
 .SH OPTIONS
 Below are the kword-specific options.
 For a full summary of options, run \fIkword \-\-help\fP.
@@ -39,14 +39,14 @@ Print the given file(s) and exit.
 .BR kformula (1),
 .BR kthesaurus (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kword/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kword/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kword/\fP.
 .SH AUTHOR