merge

1 files changed, 76 insertions, 76 deletions

diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 0c14b82f5..41779f923 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/tdenetwork/debian/control.in
@@ -13,73 +13,73 @@ Architecture: all
 Depends: dcoprss (>= ${Source-Version}), tdenetwork-tdefile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: tdenetwork-doc-html (>= ${Source-Version})
-Description: network-related apps from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: network-related apps 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 network and networking related
- applications provided with the official release of KDE.
+ applications provided with the official release of TDE.
 
 Package: dcoprss
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: RSS utilities for KDE
+Description: RSS utilities for TDE
  tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
  DCOP aware applications to access RSS news feeds. There is also
  a few sample utilities provided.
  .
  RSS is a standard for publishing news headlines.
- DCOP is the KDE interprocess communication protocol.
+ DCOP is the TDE interprocess communication protocol.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdenetwork-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdebase
-Description: KDE network 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 network documentation converted to
+Description: TDE network 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 network 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/kdict/. Documentation is provided for most
- KDE network packages.
+ TDE network packages.
  .
- This package is part of KDE, and a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, and a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdenetwork-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Enhances: konqueror
-Description: torrent metainfo plugin for KDE
+Description: torrent metainfo plugin for TDE
  This package provides a metainformation plugin for bittorrent files.
  .
  Kde uses tdefile-plugins to provide metainfo tab in the files properties
  dialog in konqueror and other file-handling applications.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdenetwork-filesharing
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, perl-suid
 Replaces: kcontrol (<< 4:3.3.0)
-Description: network filesharing configuration module for KDE
- This package provides a KDE Control Center module to configure
+Description: network filesharing configuration module for TDE
+ This package provides a Trinity Control Center module to configure
  NFS and Samba.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: kdict
 Section: net
@@ -88,45 +88,45 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Provides: dict-client
 Replaces: tdebase-data (<< 4:3.4.0)
-Description: dictionary client for KDE
- KDict is an advanced KDE graphical client for the DICT Protocol, with full
+Description: dictionary client for TDE
+ KDict is an advanced TDE graphical client for the DICT Protocol, with full
  Unicode support. It enables you to search through dictionary databases for a
  word or phrase, then displays suitable definitions. KDict tries to ease
  basic as well as advanced queries.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: kget
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: download manager for KDE
+Description: download manager for TDE
  KGet is a a download manager similar to GetRight or Go!zilla. It keeps
  all your downloads in one dialog and you can add and remove transfers.
  Transfers can be paused, resumed, queued or scheduled.
  Dialogs display info about status of transfers - progress, size, speed
- and remaining time. Program supports drag & drop from KDE
+ and remaining time. Program supports drag & drop from TDE
  applications and Netscape.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: knewsticker
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, kicker
 Suggests: khelpcenter, knewsticker-scripts
-Description: news ticker applet for KDE
- This is a news ticker applet for the KDE panel. It can scroll news from
+Description: news ticker applet for TDE
+ This is a news ticker applet for the TDE panel. It can scroll news from
  your favorite news sites, such as lwn.net, /. and freshmeat.net.
  To achieve this, KNewsTicker requires the news sites to provide a
  RSS feed to newsitems. KNewsTicker already comes with a selection of
  good news sources which provide such files.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: kopete
 Section: tde
@@ -135,7 +135,7 @@ Depends: ${shlibs:Depends}
 Recommends: tqca-tls
 Suggests: tdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting
 Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
-Description: instant messenger for KDE
+Description: instant messenger for TDE
  Kopete is an instant messenger program which can communicate with a variety
  of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
  .
@@ -145,8 +145,8 @@ Description: instant messenger for KDE
  .
  Support for more IM protocols can be added through a plugin system.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
  .
  Homepage: http://kopete.kde.org
 
@@ -155,21 +155,21 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: public fileserver for KDE
+Description: public fileserver for TDE
  kpf provides simple file sharing using HTTP. kpf is strictly a public
  fileserver, which means that there are no access restrictions to shared
  files. Whatever you select for sharing is available to anyone. kpf is
  designed to be used for sharing files with friends.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: kppp
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ppp
 Suggests: khelpcenter
-Description: modem dialer and ppp frontend for KDE
+Description: modem dialer and ppp frontend for TDE
  KPPP is a dialer and front end for pppd. It allows for interactive
  script generation and network setup. It will automate the dialing in
  process to your ISP while letting you conveniently monitor the entire
@@ -178,8 +178,8 @@ Description: modem dialer and ppp frontend for KDE
  Once connected KPPP will provide a rich set of statistics and keep
  track of the time spent online for you.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: krdc
 Section: net
@@ -187,20 +187,20 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: rdesktop (<= 1.3.1-1 )
 Suggests: rdesktop, khelpcenter
-Description: Remote Desktop Connection for KDE
- krdc is an KDE graphical client for the rfb protocol, used by VNC,
+Description: Remote Desktop Connection for TDE
+ krdc is an TDE graphical client for the rfb protocol, used by VNC,
  and if rdesktop is installed, krdc can connect to Windows Terminal
  Servers using RDP.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: krfb
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: Desktop Sharing for KDE
+Description: Desktop Sharing for TDE
  Desktop Sharing (krfb) is a server application that allows you to share
  your current session with a user on another machine, who can use a
  VNC client like krdc to view or even control the desktop. It doesn't
@@ -208,8 +208,8 @@ Description: Desktop Sharing for KDE
  This makes it very useful when you want someone to help you perform a
  task.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: ksirc
 Section: net
@@ -217,15 +217,15 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: libio-socket-ssl-perl
 Suggests: khelpcenter
-Description: IRC client for KDE
- KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
+Description: IRC client for TDE
+ KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
  lot of compatibility with mIRC for general use.
  .
  If you want to connect to an IRC server via SSL, you will need to install the
  recommended package libio-socket-ssl-perl.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: ktalkd
 Section: net
@@ -237,40 +237,40 @@ Suggests: khelpcenter
 Conflicts: talkd
 Provides: talkd
 Replaces: talkd
-Description: talk daemon for KDE
+Description: talk daemon for TDE
  KTalkd is an enhanced talk daemon - a program to handle incoming talk
  requests, announce them and allow you to respond to it using a talk
  client. Note that KTalkd is designed to run on a single-user workstation,
  and shouldn't be run on a multi-user machine.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: kwifimanager
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, wireless-tools
 Suggests: khelpcenter
-Description: wireless lan manager for KDE
+Description: wireless lan manager for TDE
  KWiFiManager suite is a set of tools which allows you to manage your
- wireless LAN connection under the K Desktop Environment. It provides
+ wireless LAN connection under the Trinity Desktop Environment. It provides
  information about your current connection. KWiFiManager supports every
  wavelan card that uses the wireless extensions interface.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: librss1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: RSS library for KDE
- This is the runtime package for programs that use the KDE RSS library.
+Description: RSS library for TDE
+ This is the runtime package for programs that use the TDE RSS library.
  End users should not need to install this, it should get installed
  automatically when needed.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdenetwork-dev
 Section: devel
@@ -278,13 +278,13 @@ Architecture: any
 Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev
 Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
 Conflicts: librss1-dev
-Description: development files for the KDE network module
- This is the development package which contains the headers for the KDE RSS
+Description: development files for the TDE network module
+ This is the development package which contains the headers for the TDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
- development-related files for the KDE network module.
+ development-related files for the TDE network module.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: lisa
 Section: net
@@ -292,12 +292,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter, samba-common
 Replaces: konqueror (<< 4:3.3.0)
-Description: LAN information server for KDE
- LISa is intended to provide KDE with a kind of "network neighborhood"
+Description: LAN information server for TDE
+ LISa is intended to provide TDE with a kind of "network neighborhood"
  but relying only on the TCP/IP protocol.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdednssd
 Section: net
@@ -305,12 +305,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
-Description: Zeroconf support for KDE
+Description: Zeroconf support for TDE
  A tdeioslave and kded module that provide Zeroconf support. Try
  "zeroconf:/" in Konqueror.
  .
- This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'tdenetwork' packages for more information.
+ This package is part of TDE, as a component of the TDE network module.
+ See the 'tde' and 'tdenetwork' packages for more information.
 
 Package: tdenetwork-dbg
 Section: libdevel