merge

1 files changed, 47 insertions, 47 deletions

diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index 62da248a9..fa01c0f9a 100644
--- a/ubuntu/maverick/tdetoys/debian/control.in
+++ b/ubuntu/maverick/tdetoys/debian/control.in
@@ -12,33 +12,33 @@ Architecture: all
 Section: tde
 Depends: amor (>= ${Source-Version}), eyesapplet (>= ${Source-Version}), fifteenapplet (>= ${Source-Version}), kmoon (>= ${Source-Version}), kodo (>= ${Source-Version}), kteatime (>= ${Source-Version}), ktux (>= ${Source-Version}), kweather (>= ${Source-Version}), kworldclock (>= ${Source-Version})
 Suggests: tdetoys-doc-html (>= ${Source-Version})
-Description: toys from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: toys from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of toys and fun extras provided
- with the official release of KDE.
+ with the official release of TDE.
 
 Package: tdetoys-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdetoys
 Replaces: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0), kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
-Description: KDE toys documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE toys documentation converted to
+Description: TDE toys documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE toys documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/amor/. Documentation is provided for most
- KDE toys packages.
+ TDE toys packages.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: amor
 Architecture: any
@@ -48,15 +48,15 @@ Recommends: twin
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: a KDE creature for your desktop
+Description: a TDE creature for your desktop
  AMOR stands for Amusing Misuse Of Resources. It provides several different
  characters who prance around your X screen doing tricks and giving you tips.
  .
  Note that AMOR will only work with some window managers. Both KWin (the
- KDE window manager) and Metacity (a GTK2 window manager) are supported.
+ TDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: eyesapplet
 Architecture: any
@@ -65,25 +65,25 @@ Depends: ${shlibs:Depends}
 Recommends: kicker
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: eyes applet for KDE
- An applet for the KDE panel containing a pair of eyes that follow your mouse
+Description: eyes applet for TDE
+ An applet for the TDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: fifteenapplet
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
 Recommends: kicker
-Description: fifteen pieces puzzle for KDE
- An applet for the KDE panel that lets you play the Fifteen Pieces
+Description: fifteen pieces puzzle for TDE
+ An applet for the TDE panel that lets you play the Fifteen Pieces
  sliding block puzzle. You have to order 15 pieces in a 4x4 square by
  moving them around.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kmoon
 Architecture: any
@@ -93,11 +93,11 @@ Recommends: kicker
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: moon phase indicator for KDE
- An applet for the KDE panel that displays the current phase of the moon.
+Description: moon phase indicator for TDE
+ An applet for the TDE panel that displays the current phase of the moon.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kodo
 Architecture: any
@@ -106,13 +106,13 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: mouse odometer for KDE
+Description: mouse odometer for TDE
  KOdometer measures your desktop mileage. It tracks the movement of your mouse
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kteatime
 Architecture: any
@@ -121,20 +121,20 @@ Depends: ${shlibs:Depends}, kicker
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: KDE utility for making a fine cup of tea
+Description: TDE utility for making a fine cup of tea
  KTeaTime is a handy timer for steeping tea. No longer will you have to
  guess at how long it takes for your tea to be ready. Simply select the
  type of tea you have, and it will alert you when the tea is ready to
  drink.
  .
- KTeaTime sits in the KDE system tray.
+ KTeaTime sits in the TDE system tray.
  .
- Please note that KTeaTime is written explicitly for KDE. If you are
- using a non-KDE window manager or desktop environment then it is quite
+ Please note that KTeaTime is written explicitly for TDE. If you are
+ using a non-TDE window manager or desktop environment then it is quite
  possible that KTeaTime will not work on your system.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: ktux
 Architecture: any
@@ -143,11 +143,11 @@ Depends: ${shlibs:Depends}
 Suggests: twin
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: Tux screensaver for KDE
- A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
+Description: Tux screensaver for TDE
+ A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kweather
 Architecture: any
@@ -155,8 +155,8 @@ Section: tde
 Depends: ${shlibs:Depends}
 Recommends: kicker
 Suggests: khelpcenter
-Description: weather display applet for KDE
- An applet for the KDE panel that displays your area's current weather.
+Description: weather display applet for TDE
+ An applet for the TDE panel that displays your area's current weather.
  Information shown includes the temperature, wind speed, air pressure
  and more. By pressing a button a full weather report can be obtained.
  .
@@ -164,8 +164,8 @@ Description: weather display applet for KDE
  stations and provide this information to other applications, including
  Konqueror's sidebar and Kontact's summary page.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kworldclock
 Architecture: any
@@ -175,16 +175,16 @@ Suggests: tdeartwork-misc, kicker, kdesktop, khelpcenter
 Conflicts: task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
 Provides: kworldwatch
-Description: earth watcher for KDE
+Description: earth watcher for TDE
  Displays where in the world it is light and dark depending on time, as
  well as offering the time in all of the major cities of the world.
- This can be run standalone, as an applet in the KDE panel or as a
+ This can be run standalone, as an applet in the TDE panel or as a
  desktop background.
  .
  Additional kworldclock themes are available in the tdeartwork-misc package.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: tdetoys-dbg
 Section: libdevel