merge

3 files changed, 19 insertions, 19 deletions

diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
index e44c4cd99..40cc5a987 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
-.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $TDEDIRS according to the current user profile."
+.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "Trinity Desktop Environment" "A tool to set $TDEDIRS according to the current user profile."
 .SH NAME
 kiosktool\-tdedirs
 \- A tool to set $TDEDIRS according to the current user profile.
 .SH SYNOPSIS
-kiosktool\-tdedirs [Qt\-options] [KDE\-options] [options] 
+kiosktool\-tdedirs [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
 
 .SH OPTIONS
@@ -20,8 +20,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
@@ -38,7 +38,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar.
@@ -135,7 +135,7 @@ mirrors the whole layout of widgets.
 .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:/kiosktool\-tdedirs/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/kiosktool\-tdedirs/'"
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..ef684635d 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
@@ -1,19 +1,19 @@
 .\" This file was generated by kdemangen.pl
-.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.TH KIOSKTOOL 1 "Ago 2004" "Trinity Desktop Environment" "KIOSK Admin Tool"
 .SH NAME
 kiosktool
 \- KIOSK Admin Tool
 .SH SYNOPSIS
-kiosktool [Qt\-options] [KDE\-options] [options] 
+kiosktool [Qt\-options] [TDE\-options] [options] 
 .SH DESCRIPTION
-With this application we can lock the access to some parts of KDE desktop
+With this application we can lock the access to some parts of Trinity desktop
 and its applications.
 
 .SH OPTIONS
 .SS Options:
 .TP
-.B  \-\-kderc  <file>
-kderc file to save settings to [/etc/kderc]
+.B  \-\-tderc  <file>
+tderc file to save settings to [/etc/tderc]
 .SS Generic options:
 .TP
 .B  \-\-help  
@@ -22,8 +22,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
@@ -40,7 +40,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar.
@@ -137,7 +137,7 @@ mirrors the whole layout of widgets.
 .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:/kiosktool/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/kiosktool/'"