Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 24 insertions, 24 deletions

diff --git a/ubuntu/maverick/kdetoys/debian/control b/ubuntu/maverick/kdetoys/debian/control
index 029c5e916..f45f650e9 100644
--- a/ubuntu/maverick/kdetoys/debian/control
+++ b/ubuntu/maverick/kdetoys/debian/control
@@ -12,21 +12,21 @@ Architecture: all
 Section: kde
 Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
 Suggests: kdetoys-trinity-doc-html (>= ${Source-Version})
-Description: toys from the official KDE3 release
+Description: toys from the official Trinity release
  KDE (the K 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 KDE3.
+ with the official release of Trinity.
 
 Package: kdetoys-trinity-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdetoys-trinity
 Replaces: amor-trinity (<< 4:2.2.0-0), kmoon-trinity (<< 4:2.2.0-0), kodo-trinity (<< 4:2.2.0-0), kteatime-trinity (<< 4:2.2.0-0), kweather-trinity (<< 4:3.0.0-0), kworldclock-trinity (<< 4:2.2.0-0)
-Description: KDE3 toys documentation in HTML format
+Description: Trinity 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
@@ -37,7 +37,7 @@ Description: KDE3 toys documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/amor/. Documentation is provided for most
  KDE toys packages.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: amor-trinity
@@ -48,14 +48,14 @@ Recommends: kwin-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: a KDE3 creature for your desktop
+Description: a Trinity 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.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: eyesapplet-trinity
@@ -65,11 +65,11 @@ Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: eyes applet for KDE3
+Description: eyes applet for Trinity
  An applet for the KDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: fifteenapplet-trinity
@@ -77,12 +77,12 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
-Description: fifteen pieces puzzle for KDE3
+Description: fifteen pieces puzzle for Trinity
  An applet for the KDE 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 KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kmoon-trinity
@@ -93,10 +93,10 @@ Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: moon phase indicator for KDE3
+Description: moon phase indicator for Trinity
  An applet for the KDE panel that displays the current phase of the moon.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kodo-trinity
@@ -106,12 +106,12 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoysv (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: mouse odometer for KDE3
+Description: mouse odometer for Trinity
  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 KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kteatime-trinity
@@ -121,19 +121,19 @@ Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: KDE3 utility for making a fine cup of tea
+Description: Trinity 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 KDE3 system tray.
+ KTeaTime sits in the Trinity system tray.
  .
- Please note that KTeaTime is written explicitly for KDE3. If you are
+ Please note that KTeaTime is written explicitly for Trinity. If you are
  using a non-KDE window manager or desktop environment then it is quite
  possible that KTeaTime will not work on your system.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: ktux-trinity
@@ -143,10 +143,10 @@ Depends: ${shlibs:Depends}
 Suggests: kwin-trinity
 Conflicts: task-kdetoys-trinity
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity
-Description: Tux screensaver for KDE3
+Description: Tux screensaver for Trinity
  A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kweather-trinity
@@ -155,7 +155,7 @@ Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
-Description: weather display applet for KDE3
+Description: weather display applet for Trinity
  An applet for the KDE 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,7 +164,7 @@ Description: weather display applet for KDE3
  stations and provide this information to other applications, including
  Konqueror's sidebar and Kontact's summary page.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kworldclock-trinity
@@ -175,7 +175,7 @@ Suggests: kdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter
 Conflicts: task-kdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
 Replaces: kdetoys-trinity (<< 4:3.0.1-0), task-kdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
 Provides: kworldwatch-trinity
-Description: earth watcher for KDE3
+Description: earth watcher for Trinity
  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
@@ -183,7 +183,7 @@ Description: earth watcher for KDE3
  .
  Additional kworldclock themes are available in the kdeartwork-misc package.
  .
- This package is part of KDE3, and a component of the KDE toys module.
+ This package is part of Trinity, and a component of the KDE toys module.
  See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
 
 Package: kdetoys-trinity-dbg