merge

1 files changed, 7 insertions, 7 deletions

diff --git a/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1 b/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1
index 38a96a27d..3ab13208f 100644
--- a/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "K Desktop Environment" "Panel applet proxy"
+.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
 .SH NAME
 appletproxy
-\- KDE kicker panel applet proxy
+\- TDE kicker panel applet proxy
 .SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [KDE\-options] \fIdesktopfile\fP
+\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
 .SH DESCRIPTION
 \fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
 .SH OPTIONS
@@ -29,8 +29,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
@@ -113,7 +113,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
@@ -156,7 +156,7 @@ Matthias Ettrich <ettrich@kde.org>
 
 .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 <Holger_Hartmann@gmx.de> 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