merge

1 files changed, 32 insertions, 32 deletions

diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 4d869d0e1..304129007 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -16,14 +16,14 @@ Breaks: kdeartwork-kde3 (<< 4:14.0.0~), kdeartwork-trinity (<< 4:14.0.0~)
 Depends: ${misc:Depends}, tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
 Recommends: tdescreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+ 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 artistic extras (themes, widget
  styles, screen savers, wallpaper, icons, emoticons and so on) provided
- with the official release of KDE.
+ with the official release of TDE.
  .
  Homepage: http://artist.kde.org 
 
@@ -34,12 +34,12 @@ Replaces: kdeartwork-emoticons-kde3 (<< 4:14.0.0~), kdeartwork-emoticons-trinity
 Breaks: kdeartwork-emoticons-kde3 (<< 4:14.0.0~), kdeartwork-emoticons-trinity (<< 4:14.0.0~)
 Enhances: kopete-trinity
 Depends: ${misc:Depends}
-Description: emoticon collections for KDE chat clients
+Description: emoticon collections for TDE chat clients
  This package contains several collections of emoticons used by official
- and unofficial KDE chat clients, such as Kopete and Konversation.
+ and unofficial TDE chat clients, such as Kopete and Konversation.
  .
- This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of TDE, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdeartwork-misc-trinity
 Architecture: all
@@ -48,12 +48,12 @@ Replaces: kdeartwork-misc-kde3 (<< 4:14.0.0~), kdeartwork-misc-trinity (<< 4:14.
 Breaks: kdeartwork-misc-kde3 (<< 4:14.0.0~), kdeartwork-misc-trinity (<< 4:14.0.0~)
 Suggests: kworldclock
 Depends: ${misc:Depends}
-Description: various multimedia goodies released with KDE
- This package contains miscellaneous multimedia goodies for KDE.
- Included are additional KDE sounds and kworldclock themes.
+Description: various multimedia goodies released with TDE
+ This package contains miscellaneous multimedia goodies for TDE.
+ Included are additional TDE sounds and kworldclock themes.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdeartwork-style-trinity
 Architecture: any
@@ -65,10 +65,10 @@ Description: widget styles released with Trinity
  This package contains additional widget styles for Trinity. Widget styles
  can be used to customise the look and feel of interface components such
  as buttons, scrollbars and so on.  They can be applied using the style
- manager in the KDE Control Centre.
+ manager in the Trinity Control Centre.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdeartwork-theme-icon-trinity
 Architecture: all
@@ -80,11 +80,11 @@ Recommends: kdesktop-trinity, kicker-trinity
 Depends: ${misc:Depends}
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be
- used to customise the appearance of standard icons throughout KDE. They
+ used to customise the appearance of standard icons throughout TDE. They
  can be applied using the icon manager in the Trinity Control Centre.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdeartwork-theme-window-trinity
 Architecture: any
@@ -98,8 +98,8 @@ Description: window decoration themes released with Trinity
  buttons, and can be applied using the window decoration manager in the Trinity
  Control Center.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdewallpapers-trinity
 Architecture: all
@@ -110,10 +110,10 @@ Suggests: twin-trinity | x-window-manager
 Depends: ${misc:Depends}
 Description: wallpapers released with Trinity
  This package contains additional wallpapers for Trinity. Wallpapers can be
- applied using the background manager in the KDE Control Centre.
+ applied using the background manager in the Trinity Control Centre.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdescreensaver-trinity
 Architecture: any
@@ -129,10 +129,10 @@ Description: additional screen savers released with Trinity
  .
  The hooks for the standard xscreensavers are no longer part of this
  package. To select and/or configure the standard xscreensavers through
- the KDE Control Center, install the separate package tdescreensaver-xsavers.
+ the Trinity Control Center, install the separate package tdescreensaver-xsavers.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdescreensaver-xsavers-trinity
 Architecture: any
@@ -154,8 +154,8 @@ Description: Trinity hooks for standard xscreensavers
  recommend the xscreensaver-gl package, as well as contain the necessary
  files to integrate these packages into Trinity.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdescreensaver-xsavers-webcollage-trinity
 Architecture: all
@@ -179,8 +179,8 @@ Description: webcollage screensaver Trinity hook
  /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdescreensaver-xsavers-extra-trinity
 Architecture: all
@@ -196,11 +196,11 @@ Description: Trinity hooks for standard xscreensavers
  the Trinity Control Centre.
  .
  Note that this package does not actually contain any screensavers itself.
- For the additional screensavers shipped with KDE, see the separate package
+ For the additional screensavers shipped with TDE, see the separate package
  tdescreensaver.
  .
- This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE artwork module.
+ See the 'tde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: tdeartwork-trinity-dbg
 Section: libdevel