Fix remaining instances of KDE3 in the Debian and Ubuntu packaging

104 files changed, 134 insertions, 134 deletions

diff --git a/debian/squeeze/applications/abakus/debian/changelog b/debian/squeeze/applications/abakus/debian/changelog
index 0a83274eb..53aea7442 100644
--- a/debian/squeeze/applications/abakus/debian/changelog
+++ b/debian/squeeze/applications/abakus/debian/changelog
@@ -6,7 +6,7 @@ abakus-trinity (0.91-0ubuntu3) karmic; urgency=low
 
 abakus-trinity (0.91-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 03 March 2009 23:58:00 -0600
diff --git a/debian/squeeze/applications/adept/debian/changelog b/debian/squeeze/applications/adept/debian/changelog
index b4f4234f3..58496db32 100644
--- a/debian/squeeze/applications/adept/debian/changelog
+++ b/debian/squeeze/applications/adept/debian/changelog
@@ -18,7 +18,7 @@ adept-trinity (2.1.3ubuntu11) karmic; urgency=low
 
 adept-trinity (2.1.3ubuntu10) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:08:00 -0600
diff --git a/debian/squeeze/applications/adept/debian/control b/debian/squeeze/applications/adept/debian/control
index 407da25d0..64cc6d154 100644
--- a/debian/squeeze/applications/adept/debian/control
+++ b/debian/squeeze/applications/adept/debian/control
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
diff --git a/debian/squeeze/applications/adept/debian/control.in b/debian/squeeze/applications/adept/debian/control.in
index df390b4e6..2c9a1ea70 100644
--- a/debian/squeeze/applications/adept/debian/control.in
+++ b/debian/squeeze/applications/adept/debian/control.in
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
diff --git a/debian/squeeze/applications/amarok.cmake/debian/changelog b/debian/squeeze/applications/amarok.cmake/debian/changelog
index 7dc833d40..43671ac52 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/changelog
+++ b/debian/squeeze/applications/amarok.cmake/debian/changelog
@@ -12,7 +12,7 @@ amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
 
 amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 03 March 2009 20:08:00 -0600
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control b/debian/squeeze/applications/amarok.cmake/debian/control
index 7aa58f6d7..3f9f0a8d2 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control
+++ b/debian/squeeze/applications/amarok.cmake/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control.in b/debian/squeeze/applications/amarok.cmake/debian/control.in
index 314cdab75..d57046d4c 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control.in
+++ b/debian/squeeze/applications/amarok.cmake/debian/control.in
@@ -20,7 +20,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok/debian/changelog b/debian/squeeze/applications/amarok/debian/changelog
index 7dc833d40..43671ac52 100644
--- a/debian/squeeze/applications/amarok/debian/changelog
+++ b/debian/squeeze/applications/amarok/debian/changelog
@@ -12,7 +12,7 @@ amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
 
 amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 03 March 2009 20:08:00 -0600
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index a0c2c0ebf..dbb0f8232 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/amarok/debian/control.in b/debian/squeeze/applications/amarok/debian/control.in
index 314cdab75..d57046d4c 100644
--- a/debian/squeeze/applications/amarok/debian/control.in
+++ b/debian/squeeze/applications/amarok/debian/control.in
@@ -20,7 +20,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/debian/squeeze/applications/basket/debian/changelog b/debian/squeeze/applications/basket/debian/changelog
index 104f10865..e50268cd0 100644
--- a/debian/squeeze/applications/basket/debian/changelog
+++ b/debian/squeeze/applications/basket/debian/changelog
@@ -6,7 +6,7 @@ basket-trinity (1.0.2-0ubuntu4) karmic; urgency=low
 
 basket-trinity (1.0.2-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/bibletime/debian/changelog b/debian/squeeze/applications/bibletime/debian/changelog
index 1271734ad..8ee32cf7c 100644
--- a/debian/squeeze/applications/bibletime/debian/changelog
+++ b/debian/squeeze/applications/bibletime/debian/changelog
@@ -92,7 +92,7 @@ bibletime (1.4.1-1) unstable; urgency=low
 
   * New upstream version
   * Exclude docbook from dh_compress, Closes: #220891
-  * Hebrew displays RTL with KDE3 so closing old bug, Closes: #158456
+  * Hebrew displays RTL with Trinity so closing old bug, Closes: #158456
   * Tried search dialog and it works fine now so, Closes: #145965
 
  -- Daniel Glassey <[email protected]>  Thu, 29 Jan 2004 22:10:38 +0000
diff --git a/debian/squeeze/applications/bibletime/debian/control b/debian/squeeze/applications/bibletime/debian/control
index 304f5597f..594a28798 100644
--- a/debian/squeeze/applications/bibletime/debian/control
+++ b/debian/squeeze/applications/bibletime/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
-Description: A bible study tool for KDE3
+Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
  It requires a working KDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
diff --git a/debian/squeeze/applications/bibletime/debian/control.in b/debian/squeeze/applications/bibletime/debian/control.in
index 6d24a8f74..d1bcaa676 100644
--- a/debian/squeeze/applications/bibletime/debian/control.in
+++ b/debian/squeeze/applications/bibletime/debian/control.in
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
-Description: A bible study tool for KDE3
+Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
  It requires a working KDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
index 5e1360642..3483239b4 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
@@ -12,7 +12,7 @@ compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low
 
 compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
index f80c35624..33a99eec5 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
@@ -15,5 +15,5 @@ Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Pr
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (KDE3) settings backend for
+ This package contains the KConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/changelog b/debian/squeeze/applications/desktop-effects-kde/debian/changelog
index 463c72470..6ec99959d 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/changelog
+++ b/debian/squeeze/applications/desktop-effects-kde/debian/changelog
@@ -6,7 +6,7 @@ desktop-effects-kde-trinity (0.4-7.4) karmic; urgency=low
 
 desktop-effects-kde-trinity (0.4-5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/control b/debian/squeeze/applications/desktop-effects-kde/debian/control
index 5893f6684..80486a941 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/control
+++ b/debian/squeeze/applications/desktop-effects-kde/debian/control
@@ -10,6 +10,6 @@ Package: desktop-effects-kde-trinity
 Architecture: all
 Depends: ${python:Depends}, python-qt4
 XB-Python-Version: ${python:Versions}
-Description: compiz setup tool for KDE3
- A simple Compiz configuration tool for KDE3.  Installs and sets Compiz
+Description: compiz setup tool for Trinity
+ A simple Compiz configuration tool for Trinity.  Installs and sets Compiz
  as the window manager.
diff --git a/debian/squeeze/applications/digikam/debian/changelog b/debian/squeeze/applications/digikam/debian/changelog
index 5e2c1f1e7..89c1b4e52 100644
--- a/debian/squeeze/applications/digikam/debian/changelog
+++ b/debian/squeeze/applications/digikam/debian/changelog
@@ -6,7 +6,7 @@ digikam-trinity (2:0.9.6-1ubuntu5) karmic; urgency=low
 
 digikam-trinity (2:0.9.4-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
@@ -26,7 +26,7 @@ digikam (2:0.9.4-1ubuntu1) intrepid; urgency=low
 digikam (2:0.9.4-1) unstable; urgency=low
 
   * New upstream release
-    - digiKam 0.9.4 Release Plan (KDE3) ~ 13 July 08 (Closes: #490144)
+    - digiKam 0.9.4 Release Plan (Trinity) ~ 13 July 08 (Closes: #490144)
   * DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
   * Debhelper compatibility level V7
   * Install pixmaps in debian/*.install
diff --git a/debian/squeeze/applications/dolphin/debian/changelog b/debian/squeeze/applications/dolphin/debian/changelog
index 7d1be436f..0c80abc8d 100644
--- a/debian/squeeze/applications/dolphin/debian/changelog
+++ b/debian/squeeze/applications/dolphin/debian/changelog
@@ -6,7 +6,7 @@ dolphin-trinity (0.9.2-1ubuntu0) karmic; urgency=low
 
 dolphin-trinity (0.9.2-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 08:18:00 -0600
diff --git a/debian/squeeze/applications/filelight-l10n/debian/changelog b/debian/squeeze/applications/filelight-l10n/debian/changelog
index c94aa81fb..1c4c5eee8 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/changelog
+++ b/debian/squeeze/applications/filelight-l10n/debian/changelog
@@ -6,7 +6,7 @@ filelight-l10n-trinity (1.0-4) karmic; urgency=low
 
 filelight-l10n-trinity (1.0-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/filelight/debian/changelog b/debian/squeeze/applications/filelight/debian/changelog
index 25f4ec9f9..57ef19426 100644
--- a/debian/squeeze/applications/filelight/debian/changelog
+++ b/debian/squeeze/applications/filelight/debian/changelog
@@ -6,7 +6,7 @@ filelight-trinity (1.0-2ubuntu5) karmic; urgency=low
 
 filelight-trinity (1.0-2ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/changelog b/debian/squeeze/applications/gtk-qt-engine/debian/changelog
index e93ade127..7bbe149b1 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/changelog
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/changelog
@@ -6,7 +6,7 @@ gtk-qt-engine-trinity (1:0.8-1ubuntu3) karmic; urgency=low
 
 gtk-qt-engine-trinity (1:0.8-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 01 March 2009 23:14:00 -0600
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/control b/debian/squeeze/applications/gtk-qt-engine/debian/control
index 57cc7fd8f..5d4629ded 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/control
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/control
@@ -10,11 +10,11 @@ Package: gtk-qt-engine-trinity
 Architecture: any
 Provides: gtk2-engines-gtk-qt-trinity
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: theme engine using Qt for GTK+ 2.x and KDE3
+Description: theme engine using Qt for GTK+ 2.x and Trinity
  The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
  that calls Qt to do the actual drawing. This makes your GTK 2 applications
  look almost like real Qt applications and gives you a more unified desktop
  experience.
  .
- Please note that this package is targeted at KDE3 users and therefore provides
+ Please note that this package is targeted at Trinity users and therefore provides
  a way to configure it from within KControl.
diff --git a/debian/squeeze/applications/gwenview/debian/changelog b/debian/squeeze/applications/gwenview/debian/changelog
index 64d43936a..fde66b4ad 100644
--- a/debian/squeeze/applications/gwenview/debian/changelog
+++ b/debian/squeeze/applications/gwenview/debian/changelog
@@ -12,7 +12,7 @@ gwenview-trinity (4:1.4.2-6) jaunty; urgency=low
 
 gwenview-trinity (4:1.4.2-5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
@@ -279,7 +279,7 @@ gwenview (0.14.3-1) unstable; urgency=low
 gwenview (0.14.1-1) unstable; urgency=low
 
   * New upstream release
-  * first KDE3
+  * first Trinity
 
  -- Michael Spanier <[email protected]>  Wed, 19 Jun 2002 16:06:22 +0200
 
diff --git a/debian/squeeze/applications/k3b/debian/changelog b/debian/squeeze/applications/k3b/debian/changelog
index 46bd8c12e..37b58f616 100644
--- a/debian/squeeze/applications/k3b/debian/changelog
+++ b/debian/squeeze/applications/k3b/debian/changelog
@@ -6,7 +6,7 @@ k3b-trinity (1.0.5-4ubuntu2) karmic; urgency=low
 
 k3b-trinity (1.0.5-4ubuntu0) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Tue, 16 June 2009 11:18:00 -0600
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index 4f7fbd18e..ef2576f9a 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
 Package: k9copy-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4
-Description: DVD backup tool for KDE3
+Description: DVD backup tool for Trinity
  k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
  to a DVD5, in the same way than DVDShrink for Microsoft Windows (R).
- This is the KDE3 version
+ This is the Trinity version
 
diff --git a/debian/squeeze/applications/kaffeine/debian/changelog b/debian/squeeze/applications/kaffeine/debian/changelog
index c2c2946e3..856250282 100644
--- a/debian/squeeze/applications/kaffeine/debian/changelog
+++ b/debian/squeeze/applications/kaffeine/debian/changelog
@@ -6,7 +6,7 @@ kaffeine-trinity (0.8.6-0ubuntu6) karmic; urgency=low
 
 kaffeine-trinity (0.8.6-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/katapult/debian/changelog b/debian/squeeze/applications/katapult/debian/changelog
index bec1d29b8..cd8c2efb9 100644
--- a/debian/squeeze/applications/katapult/debian/changelog
+++ b/debian/squeeze/applications/katapult/debian/changelog
@@ -6,7 +6,7 @@ katapult-trinity (0.3.2.1~0ubuntu3) karmic; urgency=low
 
 katapult-trinity (0.3.2.1~0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kbarcode/debian/changelog b/debian/squeeze/applications/kbarcode/debian/changelog
index 56f59d33d..1171bbbb6 100644
--- a/debian/squeeze/applications/kbarcode/debian/changelog
+++ b/debian/squeeze/applications/kbarcode/debian/changelog
@@ -6,7 +6,7 @@ kbarcode-trinity (2.0.6-0ubuntu3) karmic; urgency=low
 
 kbarcode-trinity (2.0.6-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kbarcode/debian/control b/debian/squeeze/applications/kbarcode/debian/control
index 56e2ba19d..925429b87 100644
--- a/debian/squeeze/applications/kbarcode/debian/control
+++ b/debian/squeeze/applications/kbarcode/debian/control
@@ -11,8 +11,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
 Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
  libqt3-mt-ibase
-Description: barcode and label printing application for KDE3
- KBarcode is a barcode and label printing application for KDE3. It can be used
+Description: barcode and label printing application for Trinity
+ KBarcode is a barcode and label printing application for Trinity. It can be used
  to print everything from simple business cards up to complex labels with
  several barcodes (e.g. article descriptions).
  .
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control
index 7d4846479..933c2f9d7 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -11,11 +11,11 @@ Package: kchmviewer-trinity
 Architecture: any
 Conflicts: kchmviewer-nokde-trinity
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CHM viewer for KDE3
+Description: CHM viewer for Trinity
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
  Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
  library, and does not depend on KDE or GNOME. However, it may be compiled
- with full KDE3 support, including KDE3 widgets and KIO/KHTML. 
+ with full Trinity support, including Trinity widgets and KIO/KHTML. 
  .
  The main advantage of KchmViewer is non-English language support. Unlike
  others, KchmViewer in most cases correctly detects help file encoding,
diff --git a/debian/squeeze/applications/kcpuload/debian/changelog b/debian/squeeze/applications/kcpuload/debian/changelog
index c693db202..574b5d91e 100644
--- a/debian/squeeze/applications/kcpuload/debian/changelog
+++ b/debian/squeeze/applications/kcpuload/debian/changelog
@@ -6,7 +6,7 @@ kcpuload-trinity (2.00-0ubuntu4) karmic; urgency=low
 
 kcpuload-trinity (2.00-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 04 March 2009 01:11:00 -0600
@@ -120,7 +120,7 @@ kcpuload (1.99-3) unstable; urgency=low
 
 kcpuload (1.99-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Build-depends on debhelper v4.
 
  -- Ben Burton <[email protected]>  Mon,  3 Feb 2003 10:40:27 +1100
@@ -134,7 +134,7 @@ kcpuload (1.99-1) unstable; urgency=low
 
 kcpuload (1.90-trinity-1) unstable; urgency=low
 
-  * Ported to KDE3.
+  * Ported to Trinity.
 
  -- Ben Burton <[email protected]>  Mon,  2 Sep 2002 12:57:36 +1000
 
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/changelog b/debian/squeeze/applications/kde-style-lipstik/debian/changelog
index 6431dd0a3..4e603d7ed 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/changelog
+++ b/debian/squeeze/applications/kde-style-lipstik/debian/changelog
@@ -6,7 +6,7 @@ kde-style-lipstik-trinity (2.2.3-4) karmic; urgency=low
 
 kde-style-lipstik-trinity (2.2.3-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 02 March 2009 01:07:00 -0600
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog b/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
index bcf1dc384..b89b8bc90 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
@@ -12,7 +12,7 @@ kde-style-qtcurve-trinity (0.55.2-1ubuntu7) karmic; urgency=low
 
 kde-style-qtcurve-trinity (0.55.2-1ubuntu6) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 03 March 2009 21:15:00 -0600
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/control b/debian/squeeze/applications/kde-style-qtcurve/debian/control
index b5c22af85..d6d163039 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/control
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/control
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gtk2-engines-qtcurve
 Provides: kde-style-qtcurve
-Description: This is a set of widget styles for KDE3 based apps
+Description: This is a set of widget styles for Trinity based apps
  This package together with gtk2-engines-qtcurve aim to provide a unified look
  and feel on the desktop when using KDE and Gnome applications.
  .
@@ -21,7 +21,7 @@ Description: This is a set of widget styles for KDE3 based apps
 Package: qtcurve-trinity
 Architecture: any
 Depends: kde-style-qtcurve-trinity, gtk2-engines-qtcurve
-Description: This is a set of widget styles for KDE3 and Gtk2 based apps
+Description: This is a set of widget styles for Trinity and Gtk2 based apps
  This is an empty dummy package which will drag the packages 
  kde-style-qtcurve and gtk2-engines-qtcurve in your system.
 
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright b/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
index 71042929a..055d8a659 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Bastian Venthur <[email protected]> on
 Fri, 25 May 2007 12:52:24 +0200.
 
-It was downloaded from <http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+KDE3%2C+%26+Gtk2+Theme%29?content=40492>
+It was downloaded from <http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+Trinity%2C+%26+Gtk2+Theme%29?content=40492>
 
 Upstream Author: 
 
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/changelog b/debian/squeeze/applications/kde-systemsettings/debian/changelog
index 107cbb181..7e97530ed 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/changelog
+++ b/debian/squeeze/applications/kde-systemsettings/debian/changelog
@@ -12,7 +12,7 @@ kde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
 
 kde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kdesudo/debian/changelog b/debian/squeeze/applications/kdesudo/debian/changelog
index 2ed6afde1..3e01f5533 100644
--- a/debian/squeeze/applications/kdesudo/debian/changelog
+++ b/debian/squeeze/applications/kdesudo/debian/changelog
@@ -6,7 +6,7 @@ kdesudo-trinity (4:2.5.1-4ubuntu0) karmic; urgency=low
 
 kdesudo-trinity (4:2.5.1-3ubuntu8) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 01 March 2009 23:25:00 -0600
diff --git a/debian/squeeze/applications/kdesudo/debian/control b/debian/squeeze/applications/kdesudo/debian/control
index 3a65425ab..f14497994 100644
--- a/debian/squeeze/applications/kdesudo/debian/control
+++ b/debian/squeeze/applications/kdesudo/debian/control
@@ -8,6 +8,6 @@ Standards-Version: 3.8.4
 Package: kdesudo-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, sudo
-Description: sudo frontend for KDE3
+Description: sudo frontend for Trinity
  KdeSudo is a graphical frontend for the sudo utility.
  It allows you to run programs as another user by entering your password.
diff --git a/debian/squeeze/applications/kdesvn/debian/changelog b/debian/squeeze/applications/kdesvn/debian/changelog
index 0f022062e..55c73dd3c 100644
--- a/debian/squeeze/applications/kdesvn/debian/changelog
+++ b/debian/squeeze/applications/kdesvn/debian/changelog
@@ -6,7 +6,7 @@ kdesvn-trinity (1.0.4-2~2ubuntu4) karmic; urgency=low
 
 kdesvn-trinity (1.0.4-2~0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Tue, 10 March 2009 12:31:00 -0600
@@ -19,7 +19,7 @@ kdesvn-trinity (1.0.4-2~0ubuntu3) intrepid; urgency=low
 
 kdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low
 
-  * Upload fixed KDE3 package from sid for compatibility with svn 1.5
+  * Upload fixed Trinity package from sid for compatibility with svn 1.5
     (LP: #283468)
     - Intrepid package is KDE4 and not a suitable solution for
       hardy-backports
diff --git a/debian/squeeze/applications/kdesvn/debian/control b/debian/squeeze/applications/kdesvn/debian/control
index 54e8db49d..c7849ea5e 100644
--- a/debian/squeeze/applications/kdesvn/debian/control
+++ b/debian/squeeze/applications/kdesvn/debian/control
@@ -44,7 +44,7 @@ Package: kdesvn-kio-plugins-trinity
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: subversion I/O slaves for KDE3
+Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
  inside any KIO enabled KDE application.
diff --git a/debian/squeeze/applications/kdiff3/debian/changelog b/debian/squeeze/applications/kdiff3/debian/changelog
index f2914a717..0fa5bd08b 100644
--- a/debian/squeeze/applications/kdiff3/debian/changelog
+++ b/debian/squeeze/applications/kdiff3/debian/changelog
@@ -6,7 +6,7 @@ kdiff3-trinity (0.9.92-3ubuntu0) karmic; urgency=low
 
 kdiff3-trinity (0.9.92-2ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kdirstat/debian/changelog b/debian/squeeze/applications/kdirstat/debian/changelog
index b00d4cf4a..32917f933 100644
--- a/debian/squeeze/applications/kdirstat/debian/changelog
+++ b/debian/squeeze/applications/kdirstat/debian/changelog
@@ -6,7 +6,7 @@ kdirstat-trinity (2.4.4-1ubuntu0) karmic; urgency=low
 
 kdirstat-trinity (2.4.4-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/keep/debian/changelog b/debian/squeeze/applications/keep/debian/changelog
index ce08915b3..cc2e41955 100644
--- a/debian/squeeze/applications/keep/debian/changelog
+++ b/debian/squeeze/applications/keep/debian/changelog
@@ -6,7 +6,7 @@ keep-trinity (0.4.0-0ubuntu3) karmic; urgency=low
 
 keep-trinity (0.4.0-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kerry/debian/changelog b/debian/squeeze/applications/kerry/debian/changelog
index 5ad17f564..3f36fe40e 100644
--- a/debian/squeeze/applications/kerry/debian/changelog
+++ b/debian/squeeze/applications/kerry/debian/changelog
@@ -1,6 +1,6 @@
 kerry-trinity (1:0.2.1-0ubuntu6) lucid; urgency=low
 
-  * KDE3 Lucid rebuild
+  * Trinity Lucid rebuild
 
  -- Timothy Pearson <[email protected]>  Sat, 14 Aug 2010 10:00:00 -0600
 
diff --git a/debian/squeeze/applications/kerry/debian/control b/debian/squeeze/applications/kerry/debian/control
index 15efeb828..a88165323 100644
--- a/debian/squeeze/applications/kerry/debian/control
+++ b/debian/squeeze/applications/kerry/debian/control
@@ -10,7 +10,7 @@ Package: kerry-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
 Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a KDE3 frontend for the Beagle desktop search daemon.
+ Kerry is a Trinity frontend for the Beagle desktop search daemon.
  .
  A program for indexing and searching user's data. At the moment, it can index
  filesystems, chat logs, mail and data, RSS and other.
diff --git a/debian/squeeze/applications/kerry/debian/control.in b/debian/squeeze/applications/kerry/debian/control.in
index f59651723..38fbd9e47 100644
--- a/debian/squeeze/applications/kerry/debian/control.in
+++ b/debian/squeeze/applications/kerry/debian/control.in
@@ -12,7 +12,7 @@ Package: kerry-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
 Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a KDE3 frontend for the Beagle desktop search daemon.
+ Kerry is a Trinity frontend for the Beagle desktop search daemon.
  .
  A program for indexing and searching user's data. At the moment, it can index
  filesystems, chat logs, mail and data, RSS and other.
diff --git a/debian/squeeze/applications/kile/debian/changelog b/debian/squeeze/applications/kile/debian/changelog
index 6bfb44f63..f47c5878b 100644
--- a/debian/squeeze/applications/kile/debian/changelog
+++ b/debian/squeeze/applications/kile/debian/changelog
@@ -6,7 +6,7 @@ kile-trinity (1:2.0.2-1ubuntu0) karmic; urgency=low
 
 kile-trinity (1:2.0.2-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
@@ -343,7 +343,7 @@ kile (1:1.3.2-2) unstable; urgency=low
 kile (1:1.3.2-1) unstable; urgency=low
 
   * New upstream release.
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Merged the dummy ktexmaker2 upgrade package into the kile sources.
   * Rolled the epoch to replace both the unofficial kile 1.32 packages and
     the old ktexmaker2 1.7 packages.
@@ -366,7 +366,7 @@ kile (1.2-1) unstable; urgency=low
 
   * Name change from ktexmaker2 to kile.
   * New upstream release.
-  * Built for KDE3.
+  * Built for Trinity.
 
  -- Ben Burton <[email protected]>  Mon,  2 Sep 2002 15:21:22 +1000
 
diff --git a/debian/squeeze/applications/kio-apt/debian/changelog b/debian/squeeze/applications/kio-apt/debian/changelog
index 4bbfd5b0d..53b1fa58e 100644
--- a/debian/squeeze/applications/kio-apt/debian/changelog
+++ b/debian/squeeze/applications/kio-apt/debian/changelog
@@ -6,7 +6,7 @@ kio-apt-trinity (0.13.2-5ubuntu0) karmic; urgency=low
 
 kio-apt-trinity (0.13.2-4ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-apt/debian/control b/debian/squeeze/applications/kio-apt/debian/control
index 4ef2df209..793a97da7 100644
--- a/debian/squeeze/applications/kio-apt/debian/control
+++ b/debian/squeeze/applications/kio-apt/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 Package: kio-apt-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, apt, adept-batch-trinity
-Description: an apt-cache ioslave for KDE3
+Description: an apt-cache ioslave for Trinity
  kio-apt is an ioslave which provides the apt:/ protocol. It
  integrates apt-cache functionalities into Konqueror, making
  browsing the packages easier. It provides:
diff --git a/debian/squeeze/applications/kio-locate/debian/changelog b/debian/squeeze/applications/kio-locate/debian/changelog
index 12dcfd8e9..6017937c1 100644
--- a/debian/squeeze/applications/kio-locate/debian/changelog
+++ b/debian/squeeze/applications/kio-locate/debian/changelog
@@ -6,7 +6,7 @@ kio-locate-trinity (0.4.5-1ubuntu4) karmic; urgency=low
 
 kio-locate-trinity (0.4.5-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/changelog b/debian/squeeze/applications/kio-umountwrapper/debian/changelog
index d293092dc..8c9c63417 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/changelog
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/changelog
@@ -6,7 +6,7 @@ kio-umountwrapper-trinity (0.2-1ubuntu3) karmic; urgency=low
 
 kio-umountwrapper-trinity (0.2-1ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/control b/debian/squeeze/applications/kio-umountwrapper/debian/control
index 57cd9f817..8c760573e 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/control
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kio-umountwrapper-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: progress dialog for safely removing devices in KDE3.
+Description: progress dialog for safely removing devices in Trinity.
  Wrapper around kio_media_mountwrapper.
- Provides a progress dialog for Safely Removing of devices in KDE3.
+ Provides a progress dialog for Safely Removing of devices in Trinity.
  .
   Homepage: http://frode.kde.no/misc/kio_umountwrapper/
diff --git a/debian/squeeze/applications/kmplayer/debian/changelog b/debian/squeeze/applications/kmplayer/debian/changelog
index 75eac522e..00d0559a0 100644
--- a/debian/squeeze/applications/kmplayer/debian/changelog
+++ b/debian/squeeze/applications/kmplayer/debian/changelog
@@ -6,7 +6,7 @@ kmplayer-trinity (1:0.10.0c-0ubuntu4) karmic; urgency=low
 
 kmplayer-trinity (1:0.10.0c-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kmplayer/debian/control b/debian/squeeze/applications/kmplayer/debian/control
index 360ce4778..1b45021c4 100644
--- a/debian/squeeze/applications/kmplayer/debian/control
+++ b/debian/squeeze/applications/kmplayer/debian/control
@@ -16,8 +16,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine1-x | libxine1 (<< 1.1.8-2)
 Recommends: kmplayer-plugin-trinity (= ${binary:Version})
 Suggests: ffmpeg, vdr, xawtv, mplayer
-Description: media player for KDE3
- A basic audio/video viewer application for KDE3.
+Description: media player for Trinity
+ A basic audio/video viewer application for Trinity.
  .
  KMPlayer can:
  * play DVD (DVDNav only with the Xine player)
diff --git a/debian/squeeze/applications/kmyfirewall/debian/changelog b/debian/squeeze/applications/kmyfirewall/debian/changelog
index ad0d00d57..7e048ee26 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/changelog
+++ b/debian/squeeze/applications/kmyfirewall/debian/changelog
@@ -6,7 +6,7 @@ kmyfirewall-trinity (1.1.1-1~1ubuntu1) karmic; urgency=low
 
 kmyfirewall-trinity (1.1.1-1~1ubuntu0) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kmymoney/debian/changelog b/debian/squeeze/applications/kmymoney/debian/changelog
index c5c1e9a62..9907ea10b 100644
--- a/debian/squeeze/applications/kmymoney/debian/changelog
+++ b/debian/squeeze/applications/kmymoney/debian/changelog
@@ -461,7 +461,7 @@ kmymoney2 (0.6.1-2) unstable; urgency=low
 
 kmymoney2 (0.6.1-0sarge1) testing-proposed-updates; urgency=high
 
-  * Rebuild for sarge (KDE3.2)
+  * Rebuild for sarge (Trinity.2)
   * configure   --mandir=\$${prefix}/share/man (Closes: Bug#267850)
   * Remove debian/kmymoney2.1, its included upstream
   * Remove depends-on-build-essential-package-without-using-version g++
diff --git a/debian/squeeze/applications/knemo/debian/changelog b/debian/squeeze/applications/knemo/debian/changelog
index b3709223c..31b53d817 100644
--- a/debian/squeeze/applications/knemo/debian/changelog
+++ b/debian/squeeze/applications/knemo/debian/changelog
@@ -6,7 +6,7 @@ knemo-trinity (0.4.8-3) karmic; urgency=low
 
 knemo-trinity (0.4.8-2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/knemo/debian/control b/debian/squeeze/applications/knemo/debian/control
index e5a79d896..500b81dfc 100644
--- a/debian/squeeze/applications/knemo/debian/control
+++ b/debian/squeeze/applications/knemo/debian/control
@@ -10,7 +10,7 @@ Package: knemo-trinity
 Architecture: any
 Depends: kicker-trinity, net-tools, ${shlibs:Depends}
 Recommends: kcontrol-trinity, wireless-tools
-Description: network interfaces monitor for the KDE3 systray
+Description: network interfaces monitor for the Trinity systray
  KNemo displays an icon in the systray for every network interface.
  Tooltips and an info dialog provide further information about the
  interface.  Passive popups inform about interface changes.
diff --git a/debian/squeeze/applications/knetload/debian/changelog b/debian/squeeze/applications/knetload/debian/changelog
index e2e2cdcf1..be58cc89a 100644
--- a/debian/squeeze/applications/knetload/debian/changelog
+++ b/debian/squeeze/applications/knetload/debian/changelog
@@ -6,7 +6,7 @@ knetload-trinity (2.3-3.1ubuntu0) karmic; urgency=low
 
 knetload-trinity (2.3-3.0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
@@ -119,7 +119,7 @@ knetload (1.99-3) unstable; urgency=low
 
 knetload (1.99-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Build-depends on debhelper v4.
 
  -- Ben Burton <[email protected]>  Mon,  3 Feb 2003 10:40:27 +1100
@@ -133,7 +133,7 @@ knetload (1.99-1) unstable; urgency=low
 
 knetload (1.91-trinity-1) unstable; urgency=low
 
-  * Ported to KDE3.
+  * Ported to Trinity.
 
  -- Ben Burton <[email protected]>  Mon,  2 Sep 2002 12:57:36 +1000
 
diff --git a/debian/squeeze/applications/knetstats/debian/control b/debian/squeeze/applications/knetstats/debian/control
index a836cb95d..c2f2f6429 100644
--- a/debian/squeeze/applications/knetstats/debian/control
+++ b/debian/squeeze/applications/knetstats/debian/control
@@ -9,6 +9,6 @@ Homepage: http://knetstats.sourceforge.net/
 Package: knetstats-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: network interfaces monitor for the KDE3 systray
+Description: network interfaces monitor for the Trinity systray
  A simple KDE network monitor that show rx/tx LEDs of any
  network interface on a system tray icon
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
index d1389862e..73fa9be0d 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control
@@ -30,5 +30,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
index c31b9f8b1..43adf3e33 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in
@@ -32,5 +32,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
index 36d51ca53..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager/debian/control
index 1f32d831d..c8875e68c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager/debian/control
@@ -30,5 +30,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control.in b/debian/squeeze/applications/knetworkmanager/debian/control.in
index c31b9f8b1..43adf3e33 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control.in
+++ b/debian/squeeze/applications/knetworkmanager/debian/control.in
@@ -32,5 +32,5 @@ Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
 Description: KDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for KDE3 but also works for 
+ NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/watch b/debian/squeeze/applications/knetworkmanager/debian/watch
index 36d51ca53..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/watch
+++ b/debian/squeeze/applications/knetworkmanager/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knights/debian/changelog b/debian/squeeze/applications/knights/debian/changelog
index 0d09733ee..cf45a8316 100644
--- a/debian/squeeze/applications/knights/debian/changelog
+++ b/debian/squeeze/applications/knights/debian/changelog
@@ -6,7 +6,7 @@ knights-trinity (0.6-8.3ubuntu0) karmic; urgency=low
 
 knights-trinity (0.6-8.2ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/knowit/debian/control b/debian/squeeze/applications/knowit/debian/control
index 0ee59ee1b..fef19e0c9 100644
--- a/debian/squeeze/applications/knowit/debian/control
+++ b/debian/squeeze/applications/knowit/debian/control
@@ -13,4 +13,4 @@ Depends: ${shlibs:Depends}
 Description: Tool for managing notes [Trinity]
  KnowIt is a tool for managing notes which are organized in
  tree-like hierarchy. It is similar to TuxCards,
- but KDE-based, and requires KDE3.
+ but KDE-based, and requires Trinity.
diff --git a/debian/squeeze/applications/koffice/debian/changelog b/debian/squeeze/applications/koffice/debian/changelog
index 18b0fce86..8ce61b75e 100644
--- a/debian/squeeze/applications/koffice/debian/changelog
+++ b/debian/squeeze/applications/koffice/debian/changelog
@@ -938,7 +938,7 @@ koffice (1:1.2.1-3) unstable; urgency=low
 
 koffice (1:1.2.1-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #162433).
+  * First Trinity upload to debian (closes: #162433).
   * KSpread printing improved (closes: #106472).
   * Tables no longer crash kword (closes: #111356).
   * Better import filters for kword (closes: #113347, #143480, #148986).
diff --git a/debian/squeeze/applications/konversation/debian/changelog b/debian/squeeze/applications/konversation/debian/changelog
index 3ef8e51b1..5d44efa2e 100644
--- a/debian/squeeze/applications/konversation/debian/changelog
+++ b/debian/squeeze/applications/konversation/debian/changelog
@@ -6,7 +6,7 @@ konversation-trinity (1.1-0ubuntu3) karmic; urgency=low
 
 konversation-trinity (1.1-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kopete-otr/debian/changelog b/debian/squeeze/applications/kopete-otr/debian/changelog
index 9545c589c..f7807fab8 100644
--- a/debian/squeeze/applications/kopete-otr/debian/changelog
+++ b/debian/squeeze/applications/kopete-otr/debian/changelog
@@ -6,7 +6,7 @@ kopete-otr-trinity (0.7-0ubuntu3) karmic; urgency=low
 
 kopete-otr-trinity (0.7-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kpicosim/debian/changelog b/debian/squeeze/applications/kpicosim/debian/changelog
index a60f06145..da552500b 100644
--- a/debian/squeeze/applications/kpicosim/debian/changelog
+++ b/debian/squeeze/applications/kpicosim/debian/changelog
@@ -6,7 +6,7 @@ kpicosim-trinity (0.6a-4) karmic; urgency=low
 
 kpicosim-trinity (0.6a-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/changelog b/debian/squeeze/applications/kpowersave.cmake/debian/changelog
index 206f5ef59..c23417124 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/changelog
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/changelog
@@ -6,7 +6,7 @@ kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
 kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kpowersave/debian/changelog b/debian/squeeze/applications/kpowersave/debian/changelog
index 206f5ef59..c23417124 100644
--- a/debian/squeeze/applications/kpowersave/debian/changelog
+++ b/debian/squeeze/applications/kpowersave/debian/changelog
@@ -6,7 +6,7 @@ kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
 kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/kpowersave/debian/control b/debian/squeeze/applications/kpowersave/debian/control
index 87738b5f0..faaac13d0 100644
--- a/debian/squeeze/applications/kpowersave/debian/control
+++ b/debian/squeeze/applications/kpowersave/debian/control
@@ -11,7 +11,7 @@ Homepage: http://sourceforge.net/projects/powersave/
 Package: kpowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Description: HAL based power management applet for KDE3
+Description: HAL based power management applet for Trinity
  KPowersave is a KDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on HAL to do the heavy lifting.
diff --git a/debian/squeeze/applications/krename/debian/changelog b/debian/squeeze/applications/krename/debian/changelog
index 342ef4405..fb28d1f29 100644
--- a/debian/squeeze/applications/krename/debian/changelog
+++ b/debian/squeeze/applications/krename/debian/changelog
@@ -6,7 +6,7 @@ krename-trinity (3.0.14~1ubuntu0) karmic; urgency=low
 
 krename-trinity (3.0.14~0ubuntu6) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/krename/debian/control b/debian/squeeze/applications/krename/debian/control
index 85038feef..29e40ed70 100644
--- a/debian/squeeze/applications/krename/debian/control
+++ b/debian/squeeze/applications/krename/debian/control
@@ -10,7 +10,7 @@ Package: krename-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Powerful batch renamer for KDE 3.x [Trinity]
- This package contains a very powerful batch file renamer for KDE3 
+ This package contains a very powerful batch file renamer for Trinity 
  which can rename a list of files based on a set of expressions.
  It can copy/move the files to another directory or simply rename 
  the input files.
diff --git a/debian/squeeze/applications/krusader/debian/changelog b/debian/squeeze/applications/krusader/debian/changelog
index 52e516ddf..609286530 100644
--- a/debian/squeeze/applications/krusader/debian/changelog
+++ b/debian/squeeze/applications/krusader/debian/changelog
@@ -6,7 +6,7 @@ krusader-trinity (1.90.0-3) karmic; urgency=low
 
 krusader-trinity (1.90.0-2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 05 March 2009 29:52:00 -0600
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog b/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
index 989850120..57a1db1eb 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
@@ -6,7 +6,7 @@ ksplash-engine-moodin-trinity (0.4.2-1ubuntu4) karmic; urgency=low
 
 ksplash-engine-moodin-trinity (0.4.2-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Thu, 06 Mar 2009 13:36:00 -0600
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/control b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
index 6a729f16f..589ccedb3 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/control
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.8.4
 Package: ksplash-engine-moodin-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: fading splash screen engine for KDE3
+Description: fading splash screen engine for Trinity
  Heavily customizable engine for various types of themes.
  .
  Features:
diff --git a/debian/squeeze/applications/ksquirrel/debian/README.debian b/debian/squeeze/applications/ksquirrel/debian/README.debian
index 17ed05957..7c478322f 100644
--- a/debian/squeeze/applications/ksquirrel/debian/README.debian
+++ b/debian/squeeze/applications/ksquirrel/debian/README.debian
@@ -1,4 +1,4 @@
-This program was initialy writen for KDE3. To compile it for KDE4 the
+This program was initialy writen for Trinity. To compile it for KDE4 the
 exif support is disabled. That library depends on kdelibs3.
 
 MT is enabled because configure seems not smart enough.
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control
index b46e561cd..8a7621b84 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/squeeze/applications/ksquirrel/debian/control
@@ -16,7 +16,7 @@ Standards-Version: 3.8.4
 Package: ksquirrel-trinity
 Architecture: any
 Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
-Description: Powerful KDE3 image viewer
+Description: Powerful Trinity image viewer
  KSquirrel is an image viewer for KDE with disk navigator, file tree,
  multiple directory view, thumbnails, extended thumbnails, dynamic
  format support, DCOP interface, KEXIF and KIPI plugins support.
diff --git a/debian/squeeze/applications/ksystemlog/debian/changelog b/debian/squeeze/applications/ksystemlog/debian/changelog
index 28d17e92e..908baac01 100644
--- a/debian/squeeze/applications/ksystemlog/debian/changelog
+++ b/debian/squeeze/applications/ksystemlog/debian/changelog
@@ -6,7 +6,7 @@ ksystemlog-trinity (0.3.2-2ubuntu0) karmic; urgency=low
 
 ksystemlog-trinity (0.3.2-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ksystemlog/debian/control b/debian/squeeze/applications/ksystemlog/debian/control
index 69489e2bf..d818029c1 100644
--- a/debian/squeeze/applications/ksystemlog/debian/control
+++ b/debian/squeeze/applications/ksystemlog/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: ksystemlog-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: system log viewer tool for KDE3
- ksystemlog is a system log viewer tool for KDE3.
+Description: system log viewer tool for Trinity
+ ksystemlog is a system log viewer tool for Trinity.
  .
  This program is developed for being used by beginner users, which don't know
  how to find information about their Linux system, and how the log files are in
diff --git a/debian/squeeze/applications/ktechlab/debian/changelog b/debian/squeeze/applications/ktechlab/debian/changelog
index b970f36c7..eb84eb89e 100644
--- a/debian/squeeze/applications/ktechlab/debian/changelog
+++ b/debian/squeeze/applications/ktechlab/debian/changelog
@@ -6,7 +6,7 @@ ktechlab-trinity (0.3-9~1ubuntu0) karmic; urgency=low
 
 ktechlab-trinity (0.3-9~0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ktorrent/debian/changelog b/debian/squeeze/applications/ktorrent/debian/changelog
index ad2282ecb..7d19f0f25 100644
--- a/debian/squeeze/applications/ktorrent/debian/changelog
+++ b/debian/squeeze/applications/ktorrent/debian/changelog
@@ -6,7 +6,7 @@ ktorrent-trinity (2.2.6-0ubuntu1) karmic; urgency=low
 
 ktorrent-trinity (2.2.5-0ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/squeeze/applications/ktorrent/debian/control
index c7afb4a94..059977a33 100644
--- a/debian/squeeze/applications/ktorrent/debian/control
+++ b/debian/squeeze/applications/ktorrent/debian/control
@@ -10,8 +10,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
 Recommends: kdebase-kio-plugins-trinity
-Description: BitTorrent client for KDE3
- KTorrent is a BitTorrent program for KDE3. Its features include speed capping
+Description: BitTorrent client for Trinity
+ KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
  certain file types (video and audio) and integration into the KDE Panel
  enabling background downloading.
diff --git a/debian/squeeze/applications/ktorrent/debian/control.in b/debian/squeeze/applications/ktorrent/debian/control.in
index 94ad0fce4..f688d0c53 100644
--- a/debian/squeeze/applications/ktorrent/debian/control.in
+++ b/debian/squeeze/applications/ktorrent/debian/control.in
@@ -12,8 +12,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
 Recommends: kdebase-kio-plugins-trinity
-Description: BitTorrent client for KDE3
- KTorrent is a BitTorrent program for KDE3. Its features include speed capping
+Description: BitTorrent client for Trinity
+ KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
  certain file types (video and audio) and integration into the KDE Panel
  enabling background downloading.
diff --git a/debian/squeeze/applications/kuickshow/debian/changelog b/debian/squeeze/applications/kuickshow/debian/changelog
index 081ce9dd7..6d94f0d4b 100644
--- a/debian/squeeze/applications/kuickshow/debian/changelog
+++ b/debian/squeeze/applications/kuickshow/debian/changelog
@@ -6,7 +6,7 @@ kuickshow-trinity (4:3.5.8-0ubuntu3) karmic; urgency=low
 
 kuickshow-trinity (4:3.5.8-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kvirc/debian/control b/debian/squeeze/applications/kvirc/debian/control
index 850fac844..4dc24713a 100644
--- a/debian/squeeze/applications/kvirc/debian/control
+++ b/debian/squeeze/applications/kvirc/debian/control
@@ -11,7 +11,7 @@ Homepage: http://kvirc.net/
 Package: kvirc-trinity
 Architecture: any
 Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends}
-Description:  KDE3 based next generation IRC client with module support
+Description:  Trinity based next generation IRC client with module support
  A highly configurable graphical IRC client with an MDI interface,
  built-in scripting language, support for IRC DCC, drag & drop file
  browsing, and much more. KVIrc uses the KDE widget set, can be extended
diff --git a/debian/squeeze/applications/kvkbd/debian/changelog b/debian/squeeze/applications/kvkbd/debian/changelog
index fc24ca85f..844587f33 100644
--- a/debian/squeeze/applications/kvkbd/debian/changelog
+++ b/debian/squeeze/applications/kvkbd/debian/changelog
@@ -6,7 +6,7 @@ kvkbd-trinity (0.4.8-0ubuntu3) karmic; urgency=low
 
 kvkbd-trinity (0.4.8-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/changelog b/debian/squeeze/applications/kwin-style-crystal/debian/changelog
index 8bc421e08..f330cbc5f 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/changelog
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/changelog
@@ -6,7 +6,7 @@ kwin-style-crystal-trinity (1.0.5-0ubuntu3) karmic; urgency=low
 
 kwin-style-crystal-trinity (1.0.5-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/control b/debian/squeeze/applications/kwin-style-crystal/debian/control
index 0cb4c7c92..0f61547f5 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/control
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 Package: kwin-style-crystal-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: semi transparant window decoration for KDE3
+Description: semi transparant window decoration for Trinity
  Crystal offers you pseudo transparent titlebar, buttons and borders
  transparent, so you can see more of your lovely background image
  Transparancy and buttons can be costumized to match your wishes.
diff --git a/debian/squeeze/applications/piklab/debian/changelog b/debian/squeeze/applications/piklab/debian/changelog
index 174dd3b8d..e6ae36e95 100644
--- a/debian/squeeze/applications/piklab/debian/changelog
+++ b/debian/squeeze/applications/piklab/debian/changelog
@@ -6,7 +6,7 @@ piklab-trinity (0.15.2-2ubuntu0) karmic; urgency=low
 
 piklab-trinity (0.15.2-1ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Fri, 06 March 2009 01:35:00 -0600
diff --git a/debian/squeeze/applications/potracegui/debian/changelog b/debian/squeeze/applications/potracegui/debian/changelog
index 6f6f1bc51..87afc2863 100644
--- a/debian/squeeze/applications/potracegui/debian/changelog
+++ b/debian/squeeze/applications/potracegui/debian/changelog
@@ -1,6 +1,6 @@
 potracegui-trinity (1.3-2.0ubuntu1) karmic; urgency=low
 
-  * Karmic rebuild for KDE3
+  * Karmic rebuild for Trinity
 
  -- Timothy Pearson <[email protected]>  Sat, 06 Mar 2010 06:02:00 -0600
 
diff --git a/debian/squeeze/applications/rosegarden/debian/changelog b/debian/squeeze/applications/rosegarden/debian/changelog
index 9c7acc70a..1733e9ec5 100644
--- a/debian/squeeze/applications/rosegarden/debian/changelog
+++ b/debian/squeeze/applications/rosegarden/debian/changelog
@@ -6,7 +6,7 @@ rosegarden-trinity (1:1.7.0-1ubuntu0) karmic; urgency=low
 
 rosegarden-trinity (1:1.7.0-0ubuntu5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
@@ -427,7 +427,7 @@ rosegarden4 (0.8.5-2) unstable; urgency=low
 rosegarden4 (0.8.5-1) unstable; urgency=low
 
   * New upstream version.
-  * Moved to KDE3: Now using kdelibs4-dev, closes: #180365.
+  * Moved to Trinity: Now using kdelibs4-dev, closes: #180365.
   * Using automake1.6, which seems to be necessary for trinity build scripts.
   * Added build dependency on ladspa-sdk package (debian/control).
   * Updated package description and README.Debian. Latest releases are not
diff --git a/debian/squeeze/applications/smb4k/debian/changelog b/debian/squeeze/applications/smb4k/debian/changelog
index aa42ce16c..4bbfd4f98 100644
--- a/debian/squeeze/applications/smb4k/debian/changelog
+++ b/debian/squeeze/applications/smb4k/debian/changelog
@@ -6,7 +6,7 @@ smb4k-trinity (0.9.4-0ubuntu3) karmic; urgency=low
 
 smb4k-trinity (0.9.4-0ubuntu2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/smb4k/debian/control b/debian/squeeze/applications/smb4k/debian/control
index c4fb618b7..921e4d04f 100644
--- a/debian/squeeze/applications/smb4k/debian/control
+++ b/debian/squeeze/applications/smb4k/debian/control
@@ -10,7 +10,7 @@ Package: smb4k-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
 Recommends: super | sudo-trinity
-Description: A Samba (SMB) share advanced browser for KDE3
+Description: A Samba (SMB) share advanced browser for Trinity
  Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software 
  suite to access the SMB shares of the local network neighborhood. Its purpose
  is to provide a program that's easy to use and has as many features as 
diff --git a/debian/squeeze/applications/soundkonverter/debian/changelog b/debian/squeeze/applications/soundkonverter/debian/changelog
index d0ea5e796..c6820af5d 100644
--- a/debian/squeeze/applications/soundkonverter/debian/changelog
+++ b/debian/squeeze/applications/soundkonverter/debian/changelog
@@ -6,7 +6,7 @@ soundkonverter-trinity (0.3.8-5) karmic; urgency=low
 
 soundkonverter-trinity (0.3.8-3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 17 June 2009 22:08:00 -0600
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index 149614b2c..1d04a540a 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, kdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
-Description: audio converter frontend for KDE3
+Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
  .
  The key features are:
@@ -32,7 +32,7 @@ Description: audio converter frontend for KDE3
 Package: soundkonverter-amarok-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8
-Description: audio converter frontend for KDE3 (Amarok script)
+Description: audio converter frontend for Trinity (Amarok script)
  Amarok script for soundKonverter. It allows you to easily transcode files when
  transferring them to your media device.
  .
diff --git a/debian/squeeze/applications/tellico/debian/changelog b/debian/squeeze/applications/tellico/debian/changelog
index 927869e82..01268f186 100644
--- a/debian/squeeze/applications/tellico/debian/changelog
+++ b/debian/squeeze/applications/tellico/debian/changelog
@@ -6,7 +6,7 @@ tellico-trinity (1.3.2.1-1ubuntu4) karmic; urgency=low
 
 tellico-trinity (1.3.2.1-1ubuntu3) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/yakuake/debian/changelog b/debian/squeeze/applications/yakuake/debian/changelog
index 2e7869e5a..281a3c25d 100644
--- a/debian/squeeze/applications/yakuake/debian/changelog
+++ b/debian/squeeze/applications/yakuake/debian/changelog
@@ -6,7 +6,7 @@ yakuake-trinity (2.8.1-2ubuntu1) karmic; urgency=low
 
 yakuake-trinity (2.8.1-2ubuntu0) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 05 March 2009 01:11:00 -0600