merge

1 files changed, 9 insertions, 9 deletions

diff --git a/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1
index cc48aa37d..1d17fa199 100644
--- a/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "K Desktop Environment" "The KDE panel"
+.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
 .SH NAME
 kicker
-\- The KDE panel
+\- The TDE panel
 .SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [KDE\-options] 
+\fBkicker\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-\fBKicker\fP is the KDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
+\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -16,8 +16,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -100,7 +100,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -135,7 +135,7 @@ Don't run in the background.
 .SH SEE ALSO
 \fBkasbar\fP(1)
 .sp 1
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kicker/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kicker/"
@@ -164,7 +164,7 @@ Waldo Bastian <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP