merge

1 files changed, 10 insertions, 10 deletions

diff --git a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
index 8eaf6c4fb..a3ecdc88b 100644
--- a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "K Desktop Environment" "A printer tool for KDE"
+.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
 .SH NAME
 kprinter
-\- a printer tool for KDE
+\- a printer tool for TDE
 .SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [KDE\-options] [options] file(s) 
+\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
 .SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any KDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
+\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
 .sp 1
 \fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
 .sp 1
@@ -30,7 +30,7 @@ tag the print job with accounting information for billing purposes,
 .IP "     \-"
 set the job priority for a higher or lower level to influence the order of the job queue,
 .IP "     \-"
-access the KDEPrint configurator,
+access the TDEPrint configurator,
 .IP "     \-"
 and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
 .SP
@@ -75,8 +75,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
@@ -159,7 +159,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
@@ -190,7 +190,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .SS 
 
 .SH SEE ALSO
-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:/kprinter/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kprinter/"
@@ -202,7 +202,7 @@ Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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