From c7bb5f0b917b82aed4203df3be0585be82077d9c Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Tue, 27 May 2014 01:39:46 +0200
Subject: Branding cleanup on Debian and Ubuntu

---
 debian/squeeze/tdelibs/debian/cdbs/versions.pl     |  8 ++--
 debian/squeeze/tdelibs/debian/control              |  8 ++--
 debian/squeeze/tdelibs/debian/control.in           | 52 +++++++++++-----------
 .../debian/kubuntu-desktop-i18n/createdesktop.pl   |  4 +-
 .../tdelibs/debian/kubuntu-desktop-i18n/findfiles  |  4 +-
 .../tdelibs/debian/kubuntu-desktop-i18n/msgsplit   |  2 +-
 .../tdelibs/debian/man/artsmessage-trinity.sgml    |  8 ++--
 .../tdelibs/debian/man/cupsdconf-trinity.sgml      |  8 ++--
 .../tdelibs/debian/man/cupsdoprint-trinity.1       |  8 ++--
 .../squeeze/tdelibs/debian/man/dcop-trinity.sgml   |  4 +-
 .../tdelibs/debian/man/dcopclient-trinity.1        |  6 +--
 .../tdelibs/debian/man/dcopfind-trinity.sgml       |  4 +-
 .../tdelibs/debian/man/dcopobject-trinity.1        |  6 +--
 .../squeeze/tdelibs/debian/man/dcopquit-trinity.1  |  8 ++--
 .../squeeze/tdelibs/debian/man/dcopref-trinity.1   |  6 +--
 .../tdelibs/debian/man/dcopserver-trinity.sgml     |  4 +-
 .../debian/man/dcopserver_shutdown-trinity.1       |  8 ++--
 .../tdelibs/debian/man/dcopstart-trinity.sgml      |  8 ++--
 .../tdelibs/debian/man/fileshareset-trinity.1      |  4 +-
 .../squeeze/tdelibs/debian/man/imagetops-trinity.1 |  6 +--
 .../debian/man/kaddprinterwizard-trinity.sgml      | 14 +++---
 .../tdelibs/debian/man/kcookiejar-trinity.sgml     |  8 ++--
 .../squeeze/tdelibs/debian/man/kded-trinity.sgml   |  8 ++--
 .../debian/man/kdontchangethehostname-trinity.sgml | 12 ++---
 .../squeeze/tdelibs/debian/man/kgrantpty-trinity.1 |  8 ++--
 .../tdelibs/debian/man/kinstalltheme-trinity.sgml  | 12 ++---
 .../tdelibs/debian/man/kpac_dhcp_helper-trinity.1  |  8 ++--
 debian/squeeze/tdelibs/debian/man/kshell-trinity.1 |  4 +-
 .../squeeze/tdelibs/debian/man/ksvgtopng-trinity.1 |  4 +-
 .../tdelibs/debian/man/lnusertemp-trinity.sgml     |  6 +--
 .../debian/man/make_driver_db_cups-trinity.1       |  8 ++--
 .../debian/man/make_driver_db_lpr-trinity.1        |  4 +-
 .../tdelibs/debian/man/maketdewidgets-trinity.1    | 12 ++---
 .../tdelibs/debian/man/meinproc-trinity.sgml       | 12 ++---
 .../tdelibs/debian/man/preparetips-trinity.1       |  4 +-
 .../tdelibs/debian/man/tde-config-trinity.sgml     | 16 +++----
 .../squeeze/tdelibs/debian/man/tde-menu-trinity.1  | 26 +++++------
 .../tdelibs/debian/man/tdeab2tdeabc-trinity.1      | 16 +++----
 .../tdelibs/debian/man/tdebuildsycoca-trinity.sgml |  8 ++--
 .../tdelibs/debian/man/tdecmshell-trinity.1        | 16 +++----
 .../tdelibs/debian/man/tdeconf_update-trinity.sgml | 12 ++---
 .../debian/man/tdeconfig_compiler-trinity.1        | 14 +++---
 .../tdelibs/debian/man/tdefile-trinity.sgml        | 10 ++---
 .../tdelibs/debian/man/tdehotnewstuff-trinity.1    | 20 ++++-----
 .../squeeze/tdelibs/debian/man/tdeinit-trinity.1   | 14 +++---
 .../tdelibs/debian/man/tdeinit_shutdown-trinity.1  |  4 +-
 .../man/tdeio_http_cache_cleaner-trinity.sgml      | 12 ++---
 .../tdelibs/debian/man/tdeio_uiserver-trinity.sgml | 12 ++---
 .../squeeze/tdelibs/debian/man/tdeioexec-trinity.1 | 12 ++---
 .../tdelibs/debian/man/tdelauncher-trinity.1       |  8 ++--
 .../tdelibs/debian/man/tdemailservice-trinity.sgml |  8 ++--
 .../tdelibs/debian/man/tdesendbugmail-trinity.sgml | 14 +++---
 .../tdelibs/debian/man/tdestartupconfig-trinity.1  | 12 ++---
 .../tdelibs/debian/man/tdesu_stub-trinity.1        | 14 +++---
 .../debian/man/tdetelnetservice-trinity.sgml       |  8 ++--
 .../tdelibs/debian/man/tdetradertest-trinity.1     | 14 +++---
 .../debian/man/tdeunittestmodrunner-trinity.1      | 16 +++----
 debian/squeeze/tdelibs/debian/not-installed.list   |  4 +-
 .../squeeze/tdelibs/debian/tdelibs-trinity.presubj | 10 ++---
 .../tdelibs/debian/tdelibs14-trinity.presubj       | 10 ++---
 60 files changed, 300 insertions(+), 300 deletions(-)

(limited to 'debian/squeeze/tdelibs')

diff --git a/debian/squeeze/tdelibs/debian/cdbs/versions.pl b/debian/squeeze/tdelibs/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/squeeze/tdelibs/debian/cdbs/versions.pl
+++ b/debian/squeeze/tdelibs/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/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index cb73309e6..320474004 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -51,7 +51,7 @@ Description: core shared data for all TDE applications
  TDE applications.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
 Package: tdelibs14-trinity
 Section: libs
@@ -72,7 +72,7 @@ Description: core libraries and binaries for all TDE applications
  and NFS shares, require the perl-suid package to work properly.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
 Package: tdelibs14-trinity-dev
 Section: libdevel
@@ -95,7 +95,7 @@ Description: development files for the TDE core libraries
  core TDE libraries.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
 Package: tdelibs14-trinity-doc
 Section: doc
@@ -109,7 +109,7 @@ Description: developer documentation for the TDE core libraries
  TDE libraries, than regular users.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
 Package: tdelibs-trinity-dbg
 Section: libdevel
diff --git a/debian/squeeze/tdelibs/debian/control.in b/debian/squeeze/tdelibs/debian/control.in
index 2589b9e94..efc66b1df 100644
--- a/debian/squeeze/tdelibs/debian/control.in
+++ b/debian/squeeze/tdelibs/debian/control.in
@@ -24,14 +24,14 @@ Section: libs
 Architecture: all
 Depends: tdelibs14 (>= ${Source-Version}),
  tdelibs-data (>= ${Source-Version})
-Description: core libraries from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: core libraries from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This metapackage includes the core KDE libraries, binaries, and data,
- needed by virtually all KDE applications. It does not include
+ This metapackage includes the core TDE libraries, binaries, and data,
+ needed by virtually all TDE applications. It does not include
  development files.
 
 Package: tdelibs-data
@@ -44,34 +44,34 @@ Replaces: tdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0),
  kttsd (<< 4:3.5-rc1), tdevelop3-data (<< 4:3.3.0), libdjvulibre1,
  libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3),
  kaffeine (<< 0.8.1-3)
-Description: core shared data for all KDE applications
+Description: core shared data for all TDE applications
  This package contains all the architecture independent data files
- commonly used by KDE applications. You need these data files to run
- KDE applications.
+ commonly used by TDE applications. You need these data files to run
+ TDE applications.
  .
- This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'tdelibs' packages for more information.
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde' and 'tdelibs' packages for more information.
 
 Package: tdelibs14
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
- tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, sudo
+Depends: ${shlibs:Depends}, tdelibs-data (>> ${TDE-Version3}),
+ tdelibs-data (<< ${TDE-Next-Version3}), perl, xbase-clients, sudo
 Suggests: fam, perl-suid
 Conflicts: tdelibs4, tdelibs4c2, tdelibs-bin (<< 4:3.3.3), tdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
 Replaces: tdelibs4, tdelibs4c2, tdeartwork-style (<< 4:3.4.0),
  kcontrol (<< 4:3.4.0), tdelibs-bin (<< 4:3.5.3-1),
  tdelibs4-dev (= 4:3.5.7.dfsg.1-5)
-Description: core libraries and binaries for all KDE applications
+Description: core libraries and binaries for all TDE applications
  This package contains all the shared libraries and common core binaries
- used by all KDE applications. You need these libraries and binaries to
- run KDE applications.
+ used by all TDE applications. You need these libraries and binaries to
+ run TDE applications.
  .
  Several scripts included in tdebase-bin, related to the handling of SMB
  and NFS shares, require the perl-suid package to work properly.
  .
- This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'tdelibs' packages for more information.
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde' and 'tdelibs' packages for more information.
 
 Package: tdelibs4-dev
 Section: libdevel
@@ -87,25 +87,25 @@ Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  gettext-kde, tdesdk-scripts
 Provides: tdelibs-dev
 Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
-Description: development files for the KDE core libraries
+Description: development files for the TDE core libraries
  This package contains all the headers and other related files needed
- to compile KDE applications, or develop applications which use the
- core KDE libraries.
+ to compile TDE applications, or develop applications which use the
+ core TDE libraries.
  .
- This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'tdelibs' packages for more information.
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde' and 'tdelibs' packages for more information.
 
 Package: tdelibs4-doc
 Section: doc
 Architecture: all
 Provides: tdelibs-doc
-Description: developer documentation for the KDE core libraries
- This package contains documentation for the core KDE libraries, of
+Description: developer documentation for the TDE core libraries
+ This package contains documentation for the core TDE libraries, of
  use more for developers creating applications which use the core
- KDE libraries, than regular users.
+ TDE libraries, than regular users.
  .
- This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'tdelibs' packages for more information.
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde' and 'tdelibs' packages for more information.
 
 Package: tdelibs-dbg
 Section: libdevel
diff --git a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 1e2ff4bdb..c71551dc5 100644
--- a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
@@ -30,11 +30,11 @@ sub prepare
     print "msgid \"\"\n";
     print "msgstr \"\"\n";
     print "\"Project-Id-Version: desktop files\\n\"\n";
-    print "\"Report-Msgid-Bugs-To: http://bugs.kde.org\\n\"\n";
+    print "\"Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\\n\"\n";
     print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
     print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
-    print "\"Language-Team: LANGUAGE <tde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
     print "\"MIME-Version: 1.0\\n\"\n";
     print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
     print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
index e53ad2bee..e74100337 100644
--- a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
@@ -19,7 +19,7 @@ find $dir -name "index.theme" -print | grep -v debian >> $filelist
 find $dir -name "eventsrc" -print | grep -v debian >> $filelist
 find $dir -name "*.protocol" -print | grep -v debian >> $filelist
 
-### TEMPORARY START: we do not have KDE modules
+### TEMPORARY START: we do not have TDE modules
 if true; then
 find ./konqueror -name .svn -prune , -name "directory.*" -type f  2>/dev/null | grep -v debian >> $filelist
 find ./kdesktop -name .svn -prune , -name "directory.*" -type f 2>/dev/null | grep -v debian >> $filelist 
@@ -36,7 +36,7 @@ find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
 fi
-### TEMPORARY END: we do not have KDE modules
+### TEMPORARY END: we do not have TDE modules
 
 # Extract .directory files in template directories of KOffice
 find . -name .directory|fgrep templates >> $filelist
diff --git a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/msgsplit b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
index 98789a47f..41481d336 100644
--- a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
+++ b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
@@ -10,7 +10,7 @@ wrap_before = ['<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<p>', '<br>', '<
 	       '<ol>', '<ul>', '<li>', '<table>', '<th>', '<tr>', '<td>', '<center>', 
 	       '<blockquote>', '<pre>', '<hr>', '<hr/>']
 
-### TODO: try to support any charset, not only UTF-8 (so that it can be used outside KDE)
+### TODO: try to support any charset, not only UTF-8 (so that it can be used outside TDE)
 
 def splitit( start, message, outfile ):
 	# print start+"\""+message+"\"" # DEBUG
diff --git a/debian/squeeze/tdelibs/debian/man/artsmessage-trinity.sgml b/debian/squeeze/tdelibs/debian/man/artsmessage-trinity.sgml
index 2d5d6dba8..e0950cfe4 100644
--- a/debian/squeeze/tdelibs/debian/man/artsmessage-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/artsmessage-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>-eiw</option></arg>
       <arg><option><replaceable>message</replaceable></option></arg>
 
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/cupsdconf-trinity.sgml b/debian/squeeze/tdelibs/debian/man/cupsdconf-trinity.sgml
index 425b2e89b..0960c98e6 100644
--- a/debian/squeeze/tdelibs/debian/man/cupsdconf-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/cupsdconf-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option><replaceable>file</replaceable></option></arg>
 
     </cmdsynopsis>
@@ -107,10 +107,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -269,7 +269,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1 b/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
index 52275e6f8..89275a0f7 100644
--- a/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
@@ -1,7 +1,7 @@
-.TH CUPSDOPRINT 1 "Jun 2006" "K Desktop Environment" "printing tool"
+.TH CUPSDOPRINT 1 "Jun 2006" "Trinity Desktop Environment" "printing tool"
 .SH NAME
 cupsdoprint
-\- KDE command line tool to print files via CUPS
+\- TDE command line tool to print files via CUPS
 .SH SYNOPSIS
 .BR cupsdoprint \ [ \-H \ host[:port]]\ [ \-P \ dest]\ [ \-J \ name]\ [ \-o \ opt=value[,...]]
 .RS 12
@@ -24,7 +24,7 @@ cups host to print to
 .BR \-J \ name
 print job name
 .br
-default: "KDE Print System"
+default: "TDE Print System"
 .TP
 .BR \-o \ opt=value
 options to use
@@ -53,7 +53,7 @@ Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml b/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml
index 7c4342c05..499da537e 100644
--- a/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml
@@ -109,7 +109,7 @@ manpage.1: manpage.sgml
         <term><option>--list-sessions</option>
         </term>
         <listitem>
-          <para>List all active KDE session for a user or all users.</para>
+          <para>List all active TDE session for a user or all users.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -123,7 +123,7 @@ manpage.1: manpage.sgml
         <term><option>--session <replaceable>session</replaceable></option>
         </term>
         <listitem>
-          <para>Send to the given KDE session. This option can only be used in combination with the --user option.</para>
+          <para>Send to the given TDE session. This option can only be used in combination with the --user option.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/dcopclient-trinity.1 b/debian/squeeze/tdelibs/debian/man/dcopclient-trinity.1
index 911e0c0a4..b93446c95 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopclient-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/dcopclient-trinity.1
@@ -1,7 +1,7 @@
-.TH DCOPCLIENT 1 "Jun 2006" "K Desktop Environment" ""
+.TH DCOPCLIENT 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 dcopclient
-\- extracts the application id from a DCOP reference of a KDE service
+\- extracts the application id from a DCOP reference of a TDE service
 .SH SYNOPSIS
 .B dcopclient
 .RI [ dcopref ]
@@ -23,7 +23,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcopfind-trinity.sgml b/debian/squeeze/tdelibs/debian/man/dcopfind-trinity.sgml
index 5aeb03ce0..ee71e4c05 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopfind-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/dcopfind-trinity.sgml
@@ -56,7 +56,7 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Find the DCOP reference of a KDE service</refpurpose>
+    <refpurpose>Find the DCOP reference of a TDE service</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -72,7 +72,7 @@ manpage.1: manpage.sgml
     <title>DESCRIPTION</title>
 
 	<para><command>&dhpackage;</command> returns a reference to the first
-	instance of the KDE service specified by
+	instance of the TDE service specified by
 	<replaceable>service</replaceable>. See also dcopstart, which starts a
 	service/application and immediately returns its reference.
 	</para>
diff --git a/debian/squeeze/tdelibs/debian/man/dcopobject-trinity.1 b/debian/squeeze/tdelibs/debian/man/dcopobject-trinity.1
index 24ac94724..9b21d0f22 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopobject-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/dcopobject-trinity.1
@@ -1,7 +1,7 @@
-.TH DCOPOBJECT 1 "Jun 2006" "K Desktop Environment" ""
+.TH DCOPOBJECT 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 dcopobject
-\- extracts the object id from a DCOP reference of a KDE service
+\- extracts the object id from a DCOP reference of a TDE service
 .SH SYNOPSIS
 .B dcopobject
 .RI [ dcopref ]
@@ -23,7 +23,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcopquit-trinity.1 b/debian/squeeze/tdelibs/debian/man/dcopquit-trinity.1
index d9e967f22..897d4de45 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopquit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/dcopquit-trinity.1
@@ -1,12 +1,12 @@
-.TH DCOPQUIT 1 "Jun 2006" "K Desktop Environment" ""
+.TH DCOPQUIT 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 dcopquit
-\- terminates a KDE service
+\- terminates a TDE service
 .SH SYNOPSIS
 .B dcopquit
 .RI [ applicationid ]
 .SH DESCRIPTION
-\fBdcopquit\fP terminates a KDE service via its DCOP application id. You can use \fBdcopclient\fP to extract the application id from a DCOP reference.
+\fBdcopquit\fP terminates a TDE service via its DCOP application id. You can use \fBdcopclient\fP to extract the application id from a DCOP reference.
 .SH EXAMPLES
 .TP
 .B Terminate Konqueror instance
@@ -20,7 +20,7 @@ Matthias Ettrich <ettrich@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcopref-trinity.1 b/debian/squeeze/tdelibs/debian/man/dcopref-trinity.1
index 1ebbe236e..15d8c93da 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopref-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/dcopref-trinity.1
@@ -1,7 +1,7 @@
-.TH DCOPREF 1 "Jun 2006" "K Desktop Environment" ""
+.TH DCOPREF 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 dcopref
-\- creates a DCOP reference of a KDE service from application id and object
+\- creates a DCOP reference of a TDE service from application id and object
 .SH SYNOPSIS
 .B dcopref
 .RI [ dcopclient ]\ [ dcopobject ]
@@ -20,7 +20,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcopserver-trinity.sgml b/debian/squeeze/tdelibs/debian/man/dcopserver-trinity.sgml
index d58267994..69603793b 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopserver-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/dcopserver-trinity.sgml
@@ -56,7 +56,7 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE DCOP server</refpurpose>
+    <refpurpose>TDE DCOP server</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -81,7 +81,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is the server for KDE's Desktop Communications Protocol.</para>
+    <para><command>&dhpackage;</command> is the server for TDE's Desktop Communications Protocol.</para>
 
   </refsect1>
   <refsect1>
diff --git a/debian/squeeze/tdelibs/debian/man/dcopserver_shutdown-trinity.1 b/debian/squeeze/tdelibs/debian/man/dcopserver_shutdown-trinity.1
index 51993a027..330ff0fd5 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopserver_shutdown-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/dcopserver_shutdown-trinity.1
@@ -1,11 +1,11 @@
-.TH DCOPSERVER_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.TH DCOPSERVER_SHUTDOWN 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 dcopserver_shutdown
-\- shuts down the KDE DCOP service
+\- shuts down the TDE DCOP service
 .SH SYNOPSIS
 .BR dcopserver_shutdown \ [ \-\-nokill \ |\  \-\-wait ]
 .SH DESCRIPTION
-\fBdcopserver_shutdown\fP shuts down the KDE DCOP service. When called without \fB\-\-nokill\fP the dcopserver will be terminated.
+\fBdcopserver_shutdown\fP shuts down the TDE DCOP service. When called without \fB\-\-nokill\fP the dcopserver will be terminated.
 .SH OPTIONS
 .TP
 .B \-\-nokill
@@ -25,7 +25,7 @@ Lubos Lunak <l.lunak@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/dcopstart-trinity.sgml b/debian/squeeze/tdelibs/debian/man/dcopstart-trinity.sgml
index 48b0a050d..399d95c60 100644
--- a/debian/squeeze/tdelibs/debian/man/dcopstart-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/dcopstart-trinity.sgml
@@ -56,7 +56,7 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Start a KDE service and return its DCOP reference</refpurpose>
+    <refpurpose>Start a TDE service and return its DCOP reference</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -70,8 +70,8 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>DESCRIPTION</title>
 
-    <para><command>&dhpackage;</command> starts a KDE service (i.e. an application
-	that is registered in the KDE system of .desktop files) and returns its
+    <para><command>&dhpackage;</command> starts a TDE service (i.e. an application
+	that is registered in the TDE system of .desktop files) and returns its
 	reference for later use in shell scripts. If the service is not scriptable
 	via DCOP, dcopstart returns nothing, but starts the service.</para>
 
@@ -95,7 +95,7 @@ manpage.1: manpage.sgml
     <para><example>
       <title>Get the DCOP reference for a newly started konqueror instance</title>
         <blockquote><literallayout>
-KONQ_ID=$(dcopstart konqueror http://www.kde.org)
+KONQ_ID=$(dcopstart konqueror http://www.trinitydesktop.org)
         </literallayout></blockquote>
     </example></para>
 
diff --git a/debian/squeeze/tdelibs/debian/man/fileshareset-trinity.1 b/debian/squeeze/tdelibs/debian/man/fileshareset-trinity.1
index 32cf55c8f..de354f88f 100644
--- a/debian/squeeze/tdelibs/debian/man/fileshareset-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/fileshareset-trinity.1
@@ -1,4 +1,4 @@
-.TH FILESHARESET 1 "Jun 2006" "K Desktop Environment" "file share tool"
+.TH FILESHARESET 1 "Jun 2006" "Trinity Desktop Environment" "file share tool"
 .SH NAME
 fileshareset, filesharelist
 \- add/remove/list NFS and Samba file shares
@@ -42,7 +42,7 @@ MandrakeSoft <pixel@mandrakesoft.com>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/imagetops-trinity.1 b/debian/squeeze/tdelibs/debian/man/imagetops-trinity.1
index d169ae5d5..e29b0020e 100644
--- a/debian/squeeze/tdelibs/debian/man/imagetops-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/imagetops-trinity.1
@@ -1,4 +1,4 @@
-.TH IMAGETOPS 1 "Jun 2006" "K Desktop Environment" "Generic Image to PS Filter"
+.TH IMAGETOPS 1 "Jun 2006" "Trinity Desktop Environment" "Generic Image to PS Filter"
 .SH NAME
 imagetops
 \- generic image to ps filter
@@ -6,7 +6,7 @@ imagetops
 .BR imagetops \ [ \-gray ]\ [ arguments\ for\ pnmtops ]
 .RI [  filename ]
 .SH DESCRIPTION
-\fBimagetops\fP is a generic image to ps filter. It can be used as print filter in KDE.
+\fBimagetops\fP is a generic image to ps filter. It can be used as print filter in TDE.
 .sp 1
 \fBimagetops\fP works in two steps:
 .IP "    1."
@@ -38,7 +38,7 @@ The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/kaddprinterwizard-trinity.sgml b/debian/squeeze/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
index 4550e825c..d141dca89 100644
--- a/debian/squeeze/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
@@ -63,8 +63,8 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
-      <arg><option>--kdeconfig</option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
+      <arg><option>--tdeconfig</option></arg>
       <arg><option>--serverconfig</option></arg>
 
     </cmdsynopsis>
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
@@ -343,10 +343,10 @@ manpage.1: manpage.sgml
 
     <variablelist>
       <varlistentry>
-        <term><option>--kdeconfig</option>
+        <term><option>--tdeconfig</option>
         </term>
         <listitem>
-          <para>Configure KDE Print.</para>
+          <para>Configure TDE Print.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/kcookiejar-trinity.sgml b/debian/squeeze/tdelibs/debian/man/kcookiejar-trinity.sgml
index 7cf48046f..27aa2382c 100644
--- a/debian/squeeze/tdelibs/debian/man/kcookiejar-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/kcookiejar-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--reload-config</option></arg>
       <arg><option>--remove <replaceable>domain</replaceable></option></arg>
       <arg><option>--remove-all</option></arg>
@@ -110,10 +110,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -272,7 +272,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/kded-trinity.sgml b/debian/squeeze/tdelibs/debian/man/kded-trinity.sgml
index e14dc5c06..34c664c3e 100644
--- a/debian/squeeze/tdelibs/debian/man/kded-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/kded-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--check</option></arg>
 
     </cmdsynopsis>
@@ -107,10 +107,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -269,7 +269,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/kdontchangethehostname-trinity.sgml b/debian/squeeze/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
index 4bb8117a7..6f9866156 100644
--- a/debian/squeeze/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Informs KDE about a change in hostname</refpurpose>
+    <refpurpose>Informs TDE about a change in hostname</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option><replaceable>old</replaceable></option></arg>
       <arg><option><replaceable>new</replaceable></option></arg>
 
@@ -75,7 +75,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> informs KDE about a change in hostname.</para>
+    <para><command>&dhpackage;</command> informs TDE about a change in hostname.</para>
 
   </refsect1>
   <refsect1>
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/kgrantpty-trinity.1 b/debian/squeeze/tdelibs/debian/man/kgrantpty-trinity.1
index dba0cb67c..22aa507de 100644
--- a/debian/squeeze/tdelibs/debian/man/kgrantpty-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kgrantpty-trinity.1
@@ -1,13 +1,13 @@
-.TH KGRANTPTY 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH KGRANTPTY 1 "Jun 2006" "Trinity Desktop Environment" "TDE internal"
 .SH NAME
 kgrantpty
-\- KDE helper program to fix terminal permissions
+\- TDE helper program to fix terminal permissions
 .SH DESCRIPTION
 !!! \fBkgrantpty\fP needs to be installed setuid root to function. !!!
 .br
 !!! It is not intended to be called from the command line. !!!
 .sp 1
-\fBkgrantpty\fP is a helper program for the KDE core libraries to fix terminal permissions.
+\fBkgrantpty\fP is a helper program for the TDE core libraries to fix terminal permissions.
 .SH SEE ALSO
 .BR pts (4)
 .SH AUTHORS
@@ -19,7 +19,7 @@ Lars Doelle <lars.doelle@on\-line.de>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/kinstalltheme-trinity.sgml b/debian/squeeze/tdelibs/debian/man/kinstalltheme-trinity.sgml
index ba44a533f..dcf57599a 100644
--- a/debian/squeeze/tdelibs/debian/man/kinstalltheme-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/kinstalltheme-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE Tool to build a cache list of all pixmap themes installed</refpurpose>
+    <refpurpose>TDE Tool to build a cache list of all pixmap themes installed</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
 
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -73,7 +73,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a KDE tool to build a cache list of all pixmap themes installed.</para>
+    <para><command>&dhpackage;</command> is a TDE tool to build a cache list of all pixmap themes installed.</para>
 
   </refsect1>
   <refsect1>
@@ -106,10 +106,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -268,7 +268,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/kpac_dhcp_helper-trinity.1 b/debian/squeeze/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
index 3182b311a..21066e002 100644
--- a/debian/squeeze/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
@@ -1,7 +1,7 @@
-.TH KPAC_DHCP_HELPER 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH KPAC_DHCP_HELPER 1 "Jun 2006" "Trinity Desktop Environment" "TDE internal"
 .SH NAME
 kpac_dhcp_helper
-\- KDE helper program for automatic proxy discovery via DHCP
+\- TDE helper program for automatic proxy discovery via DHCP
 .SH DESCRIPTION
 !!! \fBkpac_dhcp_helper\fP needs to be installed setuid root to function. !!!
 .br
@@ -12,14 +12,14 @@ It makes use of \fBProxy Auto Configuration\fP (\fBPAC\fP) files and is used by
 .SH SEE ALSO
 .TP
 .B http://l10n.kde.org/docs/admin/konqueror.html
-KDE Administrators Guide, Chapter 7, Konqueror: Automatic Proxy Discovery
+TDE Administrators Guide, Chapter 7, Konqueror: Automatic Proxy Discovery
 .SH AUTHORS
 .nf
 The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/kshell-trinity.1 b/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
index 5afbc3048..942f9363a 100644
--- a/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
@@ -1,4 +1,4 @@
-.TH KSHELL 1 "Jun 2006" "K Desktop Environment" ""
+.TH KSHELL 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 tdeinit_wrapper, kshell, kwrapper
 \- start applications via tdeinit
@@ -53,7 +53,7 @@ Lubos Lunak <l.lunak@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/ksvgtopng-trinity.1 b/debian/squeeze/tdelibs/debian/man/ksvgtopng-trinity.1
index ec5745095..45c779776 100644
--- a/debian/squeeze/tdelibs/debian/man/ksvgtopng-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/ksvgtopng-trinity.1
@@ -1,4 +1,4 @@
-.TH KSVGTOPNG 1 "Jun 2006" "K Desktop Environment" "SVG to PNG Filter"
+.TH KSVGTOPNG 1 "Jun 2006" "Trinity Desktop Environment" "SVG to PNG Filter"
 .SH NAME
 ksvgtopng
 \- svg to png filter
@@ -30,7 +30,7 @@ The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
index 2332768a6..7951fcc6f 100644
--- a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -54,7 +54,7 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>tool to create KDE resources and symlinks to them</refpurpose>
+    <refpurpose>tool to create TDE resources and symlinks to them</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -70,7 +70,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is used to create KDE
+    <para><command>&dhpackage;</command> is used to create TDE
     resources in temporary directories and symlinks to them in
     <envar>TDEHOME</envar>. The resource that needs to be created is
     given as an argument and can be anyone of:</para>
@@ -121,7 +121,7 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>You can find more information on the KDE's usage of
+    <para>You can find more information on the TDE's usage of
     temporary files in the Chapter <ulink
     url="http://i18n.kde.org/doc/admin/temp-files.html"><citetitle>Temporary
     and Other Files KDE Uses</citetitle></ulink> of the <ulink
diff --git a/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
index 8ca091265..d93921c98 100644
--- a/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
@@ -1,4 +1,4 @@
-.TH MAKE_DRIVER_DB_CUPS 1 "Jun 2006" "K Desktop Environment" ""
+.TH MAKE_DRIVER_DB_CUPS 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 make_driver_db_cups
 \- create a printer database from ppd files
@@ -26,9 +26,9 @@ write printer database into this file
 .SH FILES
 .TP
 .I $TDEHOME/share/apps/tdeprint/printerdb_cups.txt
-KDE printer database
+TDE printer database
 .br
-(if $TDEHOME is not set ~/.kde is used)
+(if $TDEHOME is not set ~/.trinity is used)
 .SH SEE ALSO
 .BR make_driver_db_lpr (1)
 .TP
@@ -40,7 +40,7 @@ The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/make_driver_db_lpr-trinity.1 b/debian/squeeze/tdelibs/debian/man/make_driver_db_lpr-trinity.1
index 92708abae..61493ba06 100644
--- a/debian/squeeze/tdelibs/debian/man/make_driver_db_lpr-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/make_driver_db_lpr-trinity.1
@@ -1,4 +1,4 @@
-.TH MAKE_DRIVER_DB_LPR 1 "Jun 2006" "K Desktop Environment" ""
+.TH MAKE_DRIVER_DB_LPR 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 make_driver_db_lpr
 \- create a printer database from aps filter database and ifhp filter database.
@@ -32,7 +32,7 @@ The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/maketdewidgets-trinity.1 b/debian/squeeze/tdelibs/debian/man/maketdewidgets-trinity.1
index e2a42792e..7bf32e767 100644
--- a/debian/squeeze/tdelibs/debian/man/maketdewidgets-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/maketdewidgets-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH MAKETDEWIDGETS 1 "Jun 2006" "K Desktop Environment" ""
+.TH MAKETDEWIDGETS 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 maketdewidgets
 \- Builds Qt widget plugins from an ini style description file.
 .SH SYNOPSIS
-\fBmaketdewidgets\fP [Qt\-options] [KDE\-options] file 
+\fBmaketdewidgets\fP [Qt\-options] [TDE\-options] file 
 .SH DESCRIPTION
 \fBmaketdewidgets\fP builds Qt widget plugins from an ini style description file.
 .SH OPTIONS
@@ -35,8 +35,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -53,7 +53,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -155,7 +155,7 @@ Ian Reinhart Geiser <geiseri@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/meinproc-trinity.sgml b/debian/squeeze/tdelibs/debian/man/meinproc-trinity.sgml
index e1cb2bf03..83ac2654a 100644
--- a/debian/squeeze/tdelibs/debian/man/meinproc-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/meinproc-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE Translator for XML</refpurpose>
+    <refpurpose>TDE Translator for XML</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--cache <replaceable>file</replaceable></option></arg>
       <arg><option>--check</option></arg>
       <arg><option>--htdig</option></arg>
@@ -80,7 +80,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> KDE Translator for XML</para>
+    <para><command>&dhpackage;</command> TDE Translator for XML</para>
 
   </refsect1>
   <refsect1>
@@ -113,10 +113,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -275,7 +275,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/preparetips-trinity.1 b/debian/squeeze/tdelibs/debian/man/preparetips-trinity.1
index 241444a40..6f598433b 100644
--- a/debian/squeeze/tdelibs/debian/man/preparetips-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/preparetips-trinity.1
@@ -1,4 +1,4 @@
-.TH PREPARETIPS 1 "Jun 2006" "K Desktop Environment" "translation tool"
+.TH PREPARETIPS 1 "Jun 2006" "Trinity Desktop Environment" "translation tool"
 .SH NAME
 preparetips
 \- extract text from tips file
@@ -17,7 +17,7 @@ Matthias Kiefer <matthias.kiefer@gmx.de>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml
index 9e1fa9b3d..0a6da2268 100644
--- a/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml
@@ -26,7 +26,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>">
+  <!ENTITY dhucpackage "<refentrytitle>TDE-CONFIG</refentrytitle>">
   <!ENTITY dhpackage   "tde-config">
 
   <!ENTITY debian      "<productname>Debian</productname>">
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--exec-prefix</option></arg>
       <arg><option>--expandvars</option></arg>
       <arg><option>--install <replaceable>type</replaceable></option></arg>
@@ -114,10 +114,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -276,7 +276,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
@@ -352,7 +352,7 @@ manpage.1: manpage.sgml
         <term><option>--exec-prefix</option>
         </term>
         <listitem>
-          <para>Compiled in exec_prefix for KDE libraries.</para>
+          <para>Compiled in exec_prefix for TDE libraries.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -387,14 +387,14 @@ manpage.1: manpage.sgml
         <term><option>--prefix</option>
         </term>
         <listitem>
-          <para>Compiled in prefix for KDE libraries.</para>
+          <para>Compiled in prefix for TDE libraries.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--types</option>
         </term>
         <listitem>
-          <para>Available KDE resource types.</para>
+          <para>Available TDE resource types.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1 b/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1
index 29d6191f4..c9ae5c1b7 100644
--- a/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDE\-MENU 1 "Jun 2006" "K Desktop Environment" "KDE menu query tool"
+.TH TDE\-MENU 1 "Jun 2006" "Trinity Desktop Environment" "TDE menu query tool"
 .SH NAME
-kde\-menu
-\- KDE Menu query tool.
+tde\-menu
+\- TDE Menu query tool.
 .SH SYNOPSIS
-\fBkde\-menu\fP [Qt\-options] [KDE\-options] [options] <application\-id> 
+\fBtde\-menu\fP [Qt\-options] [TDE\-options] [options] <application\-id> 
 .SH DESCRIPTION
-\fBkde\-menu\fP is a KDE menu query tool. It is used to find the menu in which a specific application is shown.
+\fBtde\-menu\fP is a TDE menu query tool. It is used to find the menu in which a specific application is shown.
 .br
-The \fB\-\-highlight\fP option visually indicates the location of a specific application in the KDE menu.
+The \fB\-\-highlight\fP option visually indicates the location of a specific application in the TDE menu.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -42,8 +42,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
@@ -60,7 +60,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -156,10 +156,10 @@ disable XIM
 mirrors the whole layout of widgets
 .SS 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kde\-menu/
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tde\-menu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kde\-menu/'"
+.BR "`khelpcenter help:/tde\-menu/'"
 from the command\-line.
 .br
 .SH AUTHORS
@@ -169,7 +169,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1
index 91157f14f..5d2267278 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KAB2KABC 1 "Jun 2006" "K Desktop Environment" "Kab to Kabc converter"
+.TH KAB2KABC 1 "Jun 2006" "Trinity Desktop Environment" "Kab to Kabc converter"
 .SH NAME
 tdeab2tdeabc
-\- KDE address book converter
+\- TDE address book converter
 .SH SYNOPSIS
-\fBtdeab2tdeabc\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeab2tdeabc\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
-\fBtdeab2tdeabc\fP converts a KDE address book from old Kab format to new Kabc format.
+\fBtdeab2tdeabc\fP converts a TDE address book from old Kab format to new Kabc format.
 .SH OPTIONS
 .SS Options:
 .TP
@@ -26,8 +26,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -44,7 +44,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -148,7 +148,7 @@ Cornelius Schumacher <schumacher@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
index d25422c50..dadd26284 100644
--- a/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--checkstamps</option></arg>
       <arg><option>--incremental</option></arg>
       <arg><option>--nosignal</option></arg>
@@ -109,10 +109,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -271,7 +271,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1
index f2f10a3c0..055cbdd68 100644
--- a/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMSHELL 1 "Jun 2006" "K Desktop Environment" "tool to start single KDE control modules"
+.TH KCMSHELL 1 "Jun 2006" "Trinity Desktop Environment" "tool to start single Trinity control modules"
 .SH NAME
 tdecmshell
-\- tool to start single KDE control modules
+\- tool to start single Trinity control modules
 .SH SYNOPSIS
-tdecmshell [Qt\-options] [KDE\-options] [options] module 
+tdecmshell [Qt\-options] [TDE\-options] [options] module 
 .SH DESCRIPTION
-\fBtdecmshell\fP is a tool to start single KDE control modules.
+\fBtdecmshell\fP is a tool to start single Trinity control modules.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -38,8 +38,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
@@ -56,7 +56,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -168,7 +168,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml
index a6e913cd2..475aa6eca 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE Tool for updating user configuration files</refpurpose>
+    <refpurpose>TDE Tool for updating user configuration files</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--check <replaceable>update-file</replaceable></option></arg>
       <arg><option><replaceable>file</replaceable></option></arg>
 
@@ -75,7 +75,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a KDE Tool for updating user configuration files.</para>
+    <para><command>&dhpackage;</command> is a TDE Tool for updating user configuration files.</para>
 
   </refsect1>
   <refsect1>
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index 788d0efe0..e7aba95e6 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCONFIG_COMPILER 1 "Jun 2006" "K Desktop Environment" "programming tool"
+.TH KCONFIG_COMPILER 1 "Jun 2006" "Trinity Desktop Environment" "programming tool"
 .SH NAME
 tdeconfig_compiler
-\- KDE configuration compiler
+\- TDE configuration compiler
 .SH SYNOPSIS
-\fBtdeconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
+\fBtdeconfig_compiler\fP [Qt\-options] [TDE\-options] [options]
 .I file.kcfg file.kcfgc 
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
@@ -32,8 +32,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -50,7 +50,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -160,7 +160,7 @@ Zack Rusin <zack@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml
index 188701812..17a94d0f1 100644
--- a/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option><replaceable>options</replaceable></option></arg>
       <arg><option><replaceable>files</replaceable></option></arg>
 
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
@@ -353,7 +353,7 @@ manpage.1: manpage.sgml
         <term><option>--dialog</option>
         </term>
         <listitem>
-          <para>Opens a KDE properties dialog to allow viewing and modifying of metadata of the given file(s).</para>
+          <para>Opens a TDE properties dialog to allow viewing and modifying of metadata of the given file(s).</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1
index a31f79e05..d8ddbed80 100644
--- a/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1
@@ -1,16 +1,16 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTNEWSTUFF 1 "Jun 2006" "K Desktop Environment" "KDE tool"
+.TH KHOTNEWSTUFF 1 "Jun 2006" "Trinity Desktop Environment" "TDE tool"
 .SH NAME
 tdehotnewstuff
-\- KDE tool to test GHNS repositories
+\- TDE tool to test GHNS repositories
 .SH SYNOPSIS
-\fBtdehotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
+\fBtdehotnewstuff\fP [Qt\-options] [TDE\-options] [options] [providerlist] 
 .SH DESCRIPTION
 \fBtdehotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
 .sp 1
-GHNS means "Get Hot New Stuff" and is a data sharing concept. It allows you to install new stuff like applets, plugins, data, sounds and wallpapers for instant use in your KDE applications.
+GHNS means "Get Hot New Stuff" and is a data sharing concept. It allows you to install new stuff like applets, plugins, data, sounds and wallpapers for instant use in your TDE applications.
 .sp 1
-GHNS consists of server installations to provide repositories and a client\-side framework to use them. In KDE the client-side framework is called \fBKHotNewStuff\fP.
+GHNS consists of server installations to provide repositories and a client\-side framework to use them. In TDE the client-side framework is called \fBKHotNewStuff\fP.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -30,8 +30,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -48,7 +48,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -146,7 +146,7 @@ mirrors the whole layout of widgets
 .SH SEE ALSO
 .TP
 .B http://kstuff.org
-KDE\-specific GHNS home page
+TDE\-specific GHNS home page
 .TP
 .B http://ghns.freedesktop.org
 "Get Hot New Stuff" home page
@@ -156,7 +156,7 @@ Cornelius Schumacher <schumacher@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
index 9c5d49965..c591fc245 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
@@ -1,28 +1,28 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.TH TDEINIT 1 "Jun 2006" "Trinity Desktop Environment" "process launcher"
 .SH NAME
 tdeinit
-\- KDE process launcher
+\- TDE process launcher
 .SH SYNOPSIS
 \fBtdeinit\fP [options]
 .SH DESCRIPTION
 \fBtdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
 .sp 1
-\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
+\fBtdeinit\fP is used to start all other TDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
 When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBtdelauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
-The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+The \fBtdeinit\fP master process can be used to start additional TDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
 KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
-Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
+Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard TDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
 .SH OPTIONS
 .TP
 .B \-\-no\-kded
 Do not start kded
 .TP
 .B \-\-suicide
-Terminate when no KDE applications are left running
+Terminate when no TDE applications are left running
 .SS
 .SH FILES
 .TP
@@ -41,7 +41,7 @@ Lubos Lunak <l.lunak@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
index 679666846..95a20cfa9 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
@@ -1,5 +1,5 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.TH TDEINIT_SHUTDOWN 1 "Jun 2006" "Trinity Desktop Environment" ""
 .SH NAME
 tdeinit_shutdown
 \- shuts down tdeinit master process
@@ -15,7 +15,7 @@ The KDE project
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs.
+Please use http://bugs.trinitydesktop.org to report bugs.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
index dc04f641f..3062176d3 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE HTTP cache maintenance tool</refpurpose>
+    <refpurpose>TDE HTTP cache maintenance tool</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--clear-all</option></arg>
 
     </cmdsynopsis>
@@ -74,7 +74,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a KDE HTTP cache maintenance tool.</para>
+    <para><command>&dhpackage;</command> is a TDE HTTP cache maintenance tool.</para>
 
   </refsect1>
   <refsect1>
@@ -107,10 +107,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -269,7 +269,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
index 5582febc6..d15b8f3a2 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>KDE Progress Information UI Server</refpurpose>
+    <refpurpose>TDE Progress Information UI Server</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
 
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -73,7 +73,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a KDE Progress Information UI Server.</para>
+    <para><command>&dhpackage;</command> is a TDE Progress Information UI Server.</para>
 
   </refsect1>
   <refsect1>
@@ -106,10 +106,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -268,7 +268,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1
index f5c8a587d..e07194181 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIOEXEC 1 "Jun 2006" "K Desktop Environment" "network transparency support"
+.TH KIOEXEC 1 "Jun 2006" "Trinity Desktop Environment" "network transparency support"
 .SH NAME
 tdeioexec, kfmexec
 \- open remote files, watch modifications, ask for upload
 .SH SYNOPSIS
-\fBtdeioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
+\fBtdeioexec\fP [Qt\-options] [TDE\-options] [options] command [URLs] 
 .SH DESCRIPTION
 \fBtdeioexec\fP offers network transparency to applications that only support local files.
 .sp 1
@@ -34,8 +34,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
@@ -52,7 +52,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -162,7 +162,7 @@ Oswald Buddenhagen <ossi@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
index 70345461d..7a49a662d 100644
--- a/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KLAUNCHER 1 "Jun 2006" "K Desktop Environment" "service activation daemon"
+.TH KLAUNCHER 1 "Jun 2006" "Trinity Desktop Environment" "service activation daemon"
 .SH NAME
 tdelauncher
-\- daemon for service activation in KDE
+\- daemon for service activation in TDE
 .SH DESCRIPTION
 !!! \fBtdelauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
 .sp 1
-\fBtdelauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
+\fBtdelauncher\fP is a daemon responsible for service activation in TDE. It operates closely together with the tdeinit master process to start new processes. TDE applications communicate with \fBtdelauncher\fP via DCOP to start new applications or services.
 .sp 1
 The error message "TDELauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
@@ -20,7 +20,7 @@ Waldo Bastian <bastian@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml
index 2ca9a311a..2ed6db99f 100644
--- a/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option><replaceable>url</replaceable></option></arg>
 
     </cmdsynopsis>
@@ -107,10 +107,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -269,7 +269,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml
index 8276bf477..7c15ce6d2 100644
--- a/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml
@@ -56,14 +56,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Sends a short bug report to submit@bugs.kde.org</refpurpose>
+    <refpurpose>Sends a short bug report to submit@bugs.trinitydesktop.org</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option>--recipient <replaceable>argument</replaceable></option></arg>
       <arg><option>--subject <replaceable>argument</replaceable></option></arg>
 
@@ -75,7 +75,7 @@ manpage.1: manpage.sgml
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> sends a short bug report to submit@bugs.kde.org</para>
+    <para><command>&dhpackage;</command> sends a short bug report to submit@bugs.trinitydesktop.org</para>
 
   </refsect1>
   <refsect1>
@@ -108,10 +108,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -270,7 +270,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
@@ -346,7 +346,7 @@ manpage.1: manpage.sgml
         <term><option>--recipient <replaceable>argument</replaceable></option>
         </term>
         <listitem>
-          <para>Recipient [submit@bugs.kde.org]</para>
+          <para>Recipient [submit@bugs.trinitydesktop.org]</para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1
index f9d0902f6..4f0f6c6e2 100644
--- a/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTARTUPCONFIG 1 "Jun 2006" "K Desktop Environment" "configuration options loader"
+.TH KSTARTUPCONFIG 1 "Jun 2006" "Trinity Desktop Environment" "configuration options loader"
 .SH NAME
 tdestartupconfig, tdedostartupconfig
-\- KDE configuration options loader
+\- TDE configuration options loader
 .SH SYNOPSIS
 \fBtdestartupconfig\fP [$TDEHOME]
 .sp 1
 \fBtdedostartupconfig\fP
 .SH DESCRIPTION
-\fBtdestartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBtdedostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBtdestartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to TDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBtdedostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
@@ -28,10 +28,10 @@ if \fBtdeconf_update\fP is used to update an option also touch the matching glob
 .SH OPTIONS
 .TP
 .B $TDEHOME
-KDE home directory, if different to ~/.kde
+TDE home directory, if different to ~/.trinity
 .SS
 .SH FILES
-In case $TDEHOME is not set ~/.kde is assumed.
+In case $TDEHOME is not set ~/.trinity is assumed.
 .TP
 .I $TDEHOME/share/config/startupconfig
 script, sourced to set shell variables with configuration options
@@ -50,7 +50,7 @@ Lubos Lunak <l.lunak@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1
index f21330cc4..02573d970 100644
--- a/debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1
@@ -1,20 +1,20 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH TDESU_STUB 1 "Jun 2006" "Trinity Desktop Environment" "TDE internal"
 .SH NAME
 tdesu_stub
-\- used by KDE su
+\- used by TDE su
 .SH DESCRIPTION
-!!! \fBtdesu_stub\fP is for KDE internal use only !!!
+!!! \fBtdesu_stub\fP is for TDE internal use only !!!
 .sp 1
-KDE su executes \fBtdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
+TDE su executes \fBtdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
 .br
 The information passed over are the X display, a X authentication cookie (if available), the PATH and the command to run.
 .sp 1
-KDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
+TDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
 .SH SEE ALSO
 .BR tdesu (1)
 .sp 1
-Full user documentation is available through the KDE Help Center. You can also enter the URL
+Full user documentation is available through the TDE Help Center. You can also enter the URL
 .BR help:/tdesu/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/tdesu/'"
@@ -27,7 +27,7 @@ Geert Jansen <jansen@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml
index 31c82361f..6552840fe 100644
--- a/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml
@@ -63,7 +63,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option><replaceable>Qt-options</replaceable></option></arg>
-      <arg><option><replaceable>KDE-options</replaceable></option></arg>
+      <arg><option><replaceable>TDE-options</replaceable></option></arg>
       <arg><option><replaceable>url</replaceable></option></arg>
 
     </cmdsynopsis>
@@ -107,10 +107,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--help-kde</option>
+        <term><option>--help-tde</option>
         </term>
         <listitem>
-          <para>Show KDE specific options.</para>
+          <para>Show TDE specific options.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -269,7 +269,7 @@ manpage.1: manpage.sgml
     </variablelist>
   </refsect1>
   <refsect1>
-    <title>KDE OPTIONS</title>
+    <title>TDE OPTIONS</title>
 
     <variablelist>
       <varlistentry>
diff --git a/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1
index 1588d433f..f1ff4599a 100644
--- a/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRADERTEST 1 "Jun 2006" "K Desktop Environment" "A TDETrader testing tool"
+.TH KTRADERTEST 1 "Jun 2006" "Trinity Desktop Environment" "A TDETrader testing tool"
 .SH NAME
 tdetradertest
 \- A TDETrader testing tool
 .SH SYNOPSIS
-\fBtdetradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
+\fBtdetradertest\fP [Qt\-options] [TDE\-options] query [genericServiceType] [constraint] [preference] 
 .SH DESCRIPTION
 \fBtdetradertest\fP is a command line tool to run trader queries.
 .sp 1
-TDETrader uses .desktop files to store information on Servicetypes and services. It provides a way to query all KDE services (applications and components) that match a specific set of requirements.
+TDETrader uses .desktop files to store information on Servicetypes and services. It provides a way to query all TDE services (applications and components) that match a specific set of requirements.
 .sp 1
 A query to TDETrader results in a list of services.
 .sp 1
@@ -36,8 +36,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
@@ -54,7 +54,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -155,7 +155,7 @@ David Faure <faure@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
index 56c4f3bc6..c271869b8 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner"
+.TH KUNITTESTMODRUNNER 1 "Jun 2006" "Trinity Desktop Environment" "KUnitTest modules runner"
 .SH NAME
 tdeunittestmodrunner
-\- a KDE command\-line application to run KUnitTest modules
+\- a TDE command\-line application to run KUnitTest modules
 .SH SYNOPSIS
-\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeunittestmodrunner\fP [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 \fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
 It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
@@ -27,8 +27,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -111,7 +111,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -144,7 +144,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .BR tdeunittestguimodrunner (1)
 .sp 1
 .TP
-.BR http://developer.kde.org
+.BR http://www.trinitydesktop.org/development.php
 KDE Developers's Corner website
 .SH AUTHORS
 .nf
@@ -152,7 +152,7 @@ Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs, do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the author directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/debian/squeeze/tdelibs/debian/not-installed.list b/debian/squeeze/tdelibs/debian/not-installed.list
index ad8dd66b4..4355d4fbd 100644
--- a/debian/squeeze/tdelibs/debian/not-installed.list
+++ b/debian/squeeze/tdelibs/debian/not-installed.list
@@ -2,10 +2,10 @@ The following files are not installed in any binary package.
 This is deliberate.
 
 /etc/xdg/menus/applications.menu
- - we install a renamed copy of this file (kde-applications.menu)
+ - we install a renamed copy of this file (tde-applications.menu)
    to avoid conflicts with GNOME. See debian/rules.
 
 /usr/share/icons/hicolor/index.theme
  - This is shipped as part of the hicolor-icon-theme package,
-   which GNOME and KDE depend on. Shipping this ourselves would
+   which GNOME and TDE depend on. Shipping this ourselves would
    result in file conflicts.
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-trinity.presubj b/debian/squeeze/tdelibs/debian/tdelibs-trinity.presubj
index 0213d87a4..fa80ec621 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-trinity.presubj
+++ b/debian/squeeze/tdelibs/debian/tdelibs-trinity.presubj
@@ -1,15 +1,15 @@
-Reporting bugs for KDE packages
+Reporting bugs for TDE packages
 -------------------------------
 
-KDE does not support beeing upgraded while running. If you do so, you may
+TDE does not support beeing upgraded while running. If you do so, you may
 encounter weird bugs (empty menus or configuration dialogs e.g.), and even
 crashes.
 
 If you recently upgraded tdelibs and/or tdebase packages, please consider:
- * exiting your current KDE session.
- * ensuring that no more KDE process is still running, especially the processes
+ * exiting your current TDE session.
+ * ensuring that no more TDE process is still running, especially the processes
    named (list beeing non-limitative): dcopserver, kded, ksmserver...
- * log in KDE again.
+ * log in TDE again.
 
 Then try to reproduce you bug. If it's not reproducible, then please do not
 report it.
diff --git a/debian/squeeze/tdelibs/debian/tdelibs14-trinity.presubj b/debian/squeeze/tdelibs/debian/tdelibs14-trinity.presubj
index 0213d87a4..fa80ec621 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs14-trinity.presubj
+++ b/debian/squeeze/tdelibs/debian/tdelibs14-trinity.presubj
@@ -1,15 +1,15 @@
-Reporting bugs for KDE packages
+Reporting bugs for TDE packages
 -------------------------------
 
-KDE does not support beeing upgraded while running. If you do so, you may
+TDE does not support beeing upgraded while running. If you do so, you may
 encounter weird bugs (empty menus or configuration dialogs e.g.), and even
 crashes.
 
 If you recently upgraded tdelibs and/or tdebase packages, please consider:
- * exiting your current KDE session.
- * ensuring that no more KDE process is still running, especially the processes
+ * exiting your current TDE session.
+ * ensuring that no more TDE process is still running, especially the processes
    named (list beeing non-limitative): dcopserver, kded, ksmserver...
- * log in KDE again.
+ * log in TDE again.
 
 Then try to reproduce you bug. If it's not reproducible, then please do not
 report it.
-- 
cgit v1.2.3