merge

3 files changed, 5 insertions, 5 deletions

diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control
index a68b789b8..74c4fd2b2 100644
--- a/ubuntu/maverick/applications/knetload/debian/control
+++ b/ubuntu/maverick/applications/knetload/debian/control
@@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}
 Conflicts: knetload
 Suggests: kcpuload-trinity
 Description: a network meter for Kicker [Trinity]
- KNetLoad is a small network meter for Kicker (the KDE panel).  It shows
+ KNetLoad is a small network meter for Kicker (the TDE panel).  It shows
  a recent history of network usage in the form of two configurable
  diagrams in the system tray, one for incoming and one for outgoing
  data.  These diagrams have settings for colours and various different
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.1 b/ubuntu/maverick/applications/knetload/debian/knetload.1
index 30b6c4e4d..ba26dcda1 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload.1
+++ b/ubuntu/maverick/applications/knetload/debian/knetload.1
@@ -21,7 +21,7 @@ knetload \- a network meter for Kicker
 .B knetload
 .RI "[ " generic-options " ]"
 .SH DESCRIPTION
-\fBKNetLoad\fP is a small program for Kicker (the KDE panel).  It
+\fBKNetLoad\fP is a small program for Kicker (the TDE panel).  It
 shows a recent history of network usage in the form of two
 configurable diagrams in the system tray, one for incoming and one
 for outgoing data.
@@ -41,14 +41,14 @@ ippp0) then you can type in your own device.
 .SH OPTIONS
 For a full summary of options, run \fIknetload \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/knetload/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/knetload/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can
+If the TDE Help Centre is not installed then you can
 read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/knetload/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/applications/knetload/debian/menu b/ubuntu/maverick/applications/knetload/debian/menu
index 4a380d449..0e0493879 100644
--- a/ubuntu/maverick/applications/knetload/debian/menu
+++ b/ubuntu/maverick/applications/knetload/debian/menu
@@ -1,4 +1,4 @@
-?package(knetload):needs="X11"\
+?package(knetload-trinity):needs="X11"\
   section="Apps/System"\
   hints="TDE"\
   title="KNetLoad"\