merge

1 files changed, 35 insertions, 35 deletions

diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index 31cd98874..731964c93 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -15,14 +15,14 @@ Replaces: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Depends: quanta-trinity (>= ${source:Version}), tdefilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
 Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
-Description: web development apps from the official KDE release [Trinity]
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: web development apps from the official TDE release [Trinity]
+ 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 web development applications
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdewebdev-trinity-doc-html
 Architecture: all
@@ -30,19 +30,19 @@ Section: doc
 Replaces: kdewebdev-kde3-doc-html (<< 4:14.0.0~), kdewebdev-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3-doc-html (<< 4:14.0.0~), kdewebdev-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdewebdev-trinity
-Description: KDE web development documentation in HTML format [Trinity]
- 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 web development documentation converted
+Description: TDE web development documentation in HTML format [Trinity]
+ 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 web development 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/quanta/. Documentation is provided for most
- KDE web development packages.
+ TDE web development packages.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-trinity
 Architecture: any
@@ -52,22 +52,22 @@ Breaks: quanta-kde3 (<< 4:14.0.0~), quanta-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tdefilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
 Recommends: cervisia-trinity, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide
 Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc
-Description: web development environment for KDE [Trinity]
+Description: web development environment for TDE [Trinity]
  Quanta Plus is a web development environment for working with HTML
  and associated languages. It strives to be neutral and transparent
  to all markup languages, while supporting popular web-based scripting
  languages, CSS and other emerging W3C recommendations.
  .
  Quanta Plus supports many external components, debuggers and other tools
- for web development, several of which are shipped with the KDE web
+ for web development, several of which are shipped with the TDE web
  development module.
  .
  Quanta Plus is not in any way affiliated with any commercial versions
  of Quanta. The primary coders from the original team left the GPL'd
  version to produce a commercial product.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-data-trinity
 Architecture: all
@@ -82,8 +82,8 @@ Description: data files for Quanta Plus web development environment [Trinity]
  .
  See the quanta package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: tdefilereplace-trinity
 Architecture: any
@@ -92,8 +92,8 @@ Replaces: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
 Breaks: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity
-Description: batch search-and-replace component for KDE [Trinity]
- KFileReplace is an embedded component for KDE that acts as a batch
+Description: batch search-and-replace component for TDE [Trinity]
+ KFileReplace is an embedded component for TDE that acts as a batch
  search-and-replace tool. It allows you to replace one expression with
  another in many files at once.
  .
@@ -101,8 +101,8 @@ Description: batch search-and-replace component for KDE [Trinity]
  application. An example of an application that uses the KFileReplace
  component is Quanta Plus (found in the package quanta).
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kimagemapeditor-trinity
 Architecture: any
@@ -111,13 +111,13 @@ Replaces: kimagemapeditor-kde3 (<< 4:14.0.0~), kimagemapeditor-trinity (<< 4:14.
 Breaks: kimagemapeditor-kde3 (<< 4:14.0.0~), kimagemapeditor-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity
-Description: HTML image map editor for KDE [Trinity]
+Description: HTML image map editor for TDE [Trinity]
  KImageMapEditor is a tool that allows you to edit image maps in HTML
  files. As well as providing a standalone application, KImageMapEditor
  makes itself available as a KPart for embedding into larger applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: klinkstatus-trinity
 Architecture: any
@@ -126,16 +126,16 @@ Replaces: klinkstatus-kde3 (<< 4:14.0.0~), klinkstatus-trinity (<< 4:14.0.0~)
 Breaks: klinkstatus-kde3 (<< 4:14.0.0~), klinkstatus-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity, khelpcenter-trinity
-Description: web link validity checker for KDE [Trinity]
- KLinkStatus is KDE's web link validity checker. It allows you to
+Description: web link validity checker for TDE [Trinity]
+ KLinkStatus is TDE's web link validity checker. It allows you to
  search internal and external links throughout your web site. Simply
  point it to a single page and choose the depth to search.
  .
  You can also check local files, or files over ftp:, fish: or any other
  KIO protocols. For performance, links can be checked simultaneously.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity
 Architecture: any
@@ -163,8 +163,8 @@ Description: visual dialog builder and executor tool [Trinity]
  As well as building dialogs, Kommander may be expanded to create full
  mainwindow applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity-dev
 Architecture: any
@@ -182,8 +182,8 @@ Description: development files for Kommander [Trinity]
  .
  See the kommander package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kxsldbg-trinity
 Architecture: any
@@ -192,17 +192,17 @@ Replaces: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
 Breaks: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity, khelpcenter-trinity
-Description: graphical XSLT debugger for KDE [Trinity]
+Description: graphical XSLT debugger for TDE [Trinity]
  KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
  interface as well as a text-based debugger. KXSLDbg can be run as a
- standalone application or as an embedded KDE part.
+ standalone application or as an embedded TDE part.
  .
  XSLT is an XML language for defining transformations of XML files from
  XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
  using standard XSLT stylesheets.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: tdewebdev-trinity-dbg
 Section: libdevel