Rename remaining KDE strings to TDE, with the exception of a couple of build variables

68 files changed, 243 insertions, 243 deletions

diff --git a/IconThemes/kdeclassic/index.theme b/IconThemes/kdeclassic/index.theme
index b9c0acd4..f3172244 100644
--- a/IconThemes/kdeclassic/index.theme
+++ b/IconThemes/kdeclassic/index.theme
@@ -1,112 +1,112 @@
 [Icon Theme]
-Name=KDE-Classic
-Name[ca]=KDE-Clàssic
+Name=TDE-Classic
+Name[ca]=TDE-Clàssic
 Name[cs]=Klasický
-Name[cy]=Clasurol KDE
-Name[el]=KDE-Κλασικό
-Name[eo]=KDE-Klasika
-Name[es]=KDE-Clásico
-Name[et]=KDE klassikaline
-Name[eu]=KDE-Klasikoa
-Name[fa]=KDE کلاسیک
-Name[fi]=Klassinen KDE
-Name[fy]=KDE-klassyk
-Name[ga]=KDE Clasaiceach
-Name[gl]=KDE-Clásico
-Name[he]=קלסי של KDE
+Name[cy]=Clasurol TDE
+Name[el]=TDE-Κλασικό
+Name[eo]=TDE-Klasika
+Name[es]=TDE-Clásico
+Name[et]=TDE klassikaline
+Name[eu]=TDE-Klasikoa
+Name[fa]=TDE کلاسیک
+Name[fi]=Klassinen TDE
+Name[fy]=TDE-klassyk
+Name[ga]=TDE Clasaiceach
+Name[gl]=TDE-Clásico
+Name[he]=קלסי של TDE
 Name[hi]=केडीई-क्लासिक
-Name[is]=KDE-klassíkt
-Name[it]=KDE classico
-Name[ja]=KDE クラシック
+Name[is]=TDE-klassíkt
+Name[it]=TDE classico
+Name[ja]=TDE クラシック
 Name[ka]=კლასიკური
-Name[mk]=KDE-Класик
-Name[ms]=KDE-Klasik
-Name[nb]=KDE-Klassisk
+Name[mk]=TDE-Класик
+Name[ms]=TDE-Klasik
+Name[nb]=TDE-Klassisk
 Name[ne]=केडीई-पुरानो
-Name[nl]=KDE-klassiek
-Name[nn]=Klassisk KDE
-Name[nso]=Maemo a KDE
-Name[pl]=Klasyczny KDE
-Name[pt]=KDE-Clássico
-Name[pt_BR]=KDE Clássico
-Name[ro]=KDE Clasic
+Name[nl]=TDE-klassiek
+Name[nn]=Klassisk TDE
+Name[nso]=Maemo a TDE
+Name[pl]=Klasyczny TDE
+Name[pt]=TDE-Clássico
+Name[pt_BR]=TDE Clássico
+Name[ro]=TDE Clasic
 Name[ru]=Классика
-Name[sk]=KDE klasická
-Name[sl]=KDE - Klasično
-Name[sr]=Класични KDE
-Name[sr@Latn]=Klasični KDE
-Name[sv]=KDE klassisk
-Name[ta]=KDE-பழைய
+Name[sk]=TDE klasická
+Name[sl]=TDE - Klasično
+Name[sr]=Класични TDE
+Name[sr@Latn]=Klasični TDE
+Name[sv]=TDE klassisk
+Name[ta]=TDE-பழைய
 Name[tg]=Классика
-Name[tr]=Klasik KDE
-Name[uk]=Класичний KDE
-Name[uz]=KDE klassika
-Name[uz@cyrillic]=KDE классика
-Name[ven]=KDE ya tshifhingani tsho fhelaho
-Name[vi]=KDE-Truyền thống
-Name[xh]=KDE-Endala
-Name[zh_CN]=KDE 经典
-Name[zh_TW]=KDE-古典
-Name[zu]=Okwasendulo kwe-KDE
-Comment=KDE Classic Icon Theme
-Comment[bg]=Класическата тема с икони за KDE
-Comment[br]=Giz arlun da gustum evit KDE
-Comment[bs]=KDE klasična tema ikona
-Comment[ca]=Tema d'icones KDE clàssic
-Comment[cs]=Klasický motiv ikon KDE
-Comment[cy]=Thema Eicon Clasurol KDE
-Comment[da]=KDE's klassiske ikontema
-Comment[de]=KDE-Classic Symboldesign
-Comment[el]=Κλασικό θέμα εικονιδίων του KDE
-Comment[eo]=KDE-klasika piktogrametoso
-Comment[es]=Tema de iconos KDE clásico
-Comment[et]=KDE klassikaline ikooniteema
-Comment[eu]=KDE-ren ikono gai klasikoa
-Comment[fa]=چهرۀ شمایل KDE کلاسیک
-Comment[fi]=Klassisen KDE:n kuvaketeema
-Comment[fr]=Thème d'icônes KDE Classique
-Comment[fy]=It klassike KDE-piktogramtema
-Comment[ga]=Téama Deilbhíní Clasaiceach KDE
-Comment[gl]=Os ícones clásicos de KDE
-Comment[he]=ערכת סמלים קלסית של KDE
+Name[tr]=Klasik TDE
+Name[uk]=Класичний TDE
+Name[uz]=TDE klassika
+Name[uz@cyrillic]=TDE классика
+Name[ven]=TDE ya tshifhingani tsho fhelaho
+Name[vi]=TDE-Truyền thống
+Name[xh]=TDE-Endala
+Name[zh_CN]=TDE 经典
+Name[zh_TW]=TDE-古典
+Name[zu]=Okwasendulo kwe-TDE
+Comment=TDE Classic Icon Theme
+Comment[bg]=Класическата тема с икони за TDE
+Comment[br]=Giz arlun da gustum evit TDE
+Comment[bs]=TDE klasična tema ikona
+Comment[ca]=Tema d'icones TDE clàssic
+Comment[cs]=Klasický motiv ikon TDE
+Comment[cy]=Thema Eicon Clasurol TDE
+Comment[da]=TDE's klassiske ikontema
+Comment[de]=TDE-Classic Symboldesign
+Comment[el]=Κλασικό θέμα εικονιδίων του TDE
+Comment[eo]=TDE-klasika piktogrametoso
+Comment[es]=Tema de iconos TDE clásico
+Comment[et]=TDE klassikaline ikooniteema
+Comment[eu]=TDE-ren ikono gai klasikoa
+Comment[fa]=چهرۀ شمایل TDE کلاسیک
+Comment[fi]=Klassisen TDE:n kuvaketeema
+Comment[fr]=Thème d'icônes TDE Classique
+Comment[fy]=It klassike TDE-piktogramtema
+Comment[ga]=Téama Deilbhíní Clasaiceach TDE
+Comment[gl]=Os ícones clásicos de TDE
+Comment[he]=ערכת סמלים קלסית של TDE
 Comment[hi]=केडीई क्लासिक प्रतीक प्रसंग
-Comment[hu]=Hagyományos KDE-s ikontéma
-Comment[is]=KDE Klassískt táknmyndaþema
-Comment[it]=Il tema di KDE con icone classiche
-Comment[ja]=KDE クラシックアイコンテーマ
-Comment[ka]=KDE პიქტოგრამების კლასიკური თემა
-Comment[lt]=KDE Classic ženkliukų tema
-Comment[mk]=Класична тема за икони во KDE
-Comment[ms]=Tema Ikon Klasik KDE
-Comment[nb]=KDE Klassisk ikontema
-Comment[nds]=Dat klass'sche Lüttbildmuster vun KDE
+Comment[hu]=Hagyományos TDE-s ikontéma
+Comment[is]=TDE Klassískt táknmyndaþema
+Comment[it]=Il tema di TDE con icone classiche
+Comment[ja]=TDE クラシックアイコンテーマ
+Comment[ka]=TDE პიქტოგრამების კლასიკური თემა
+Comment[lt]=TDE Classic ženkliukų tema
+Comment[mk]=Класична тема за икони во TDE
+Comment[ms]=Tema Ikon Klasik TDE
+Comment[nb]=TDE Klassisk ikontema
+Comment[nds]=Dat klass'sche Lüttbildmuster vun TDE
 Comment[ne]=केडीई पुरानो प्रतिमा विषयवस्तु
-Comment[nl]=Het klassieke KDE-pictogramthema
-Comment[nn]=Klassisk KDE-ikontema
-Comment[nso]=Molaetsa wa Seemedi sa Maemo a KDE
-Comment[pa]=KDE ਟਕਸਾਲੀ ਆਈਕਾਨ ਸਰੂਪ
-Comment[pl]=Klasyczny motyw ikon KDE
-Comment[pt]=Tema de Ícones Clássico do KDE
-Comment[pt_BR]=Temas de Ícones Clássico do KDE
-Comment[ro]=Tematică de iconiţe KDE clasică
-Comment[ru]=Классическая тема значков KDE
-Comment[sk]=Klasická ikonová téma KDE
-Comment[sl]=Tema klasičnih ikon KDE
-Comment[sr]=Класична KDE-ова тема икона
-Comment[sr@Latn]=Klasična KDE-ova tema ikona
-Comment[sv]=Klassiskt KDE-ikontema
-Comment[ta]=KDE பழைய சின்ன பொருள்
-Comment[tg]=Мавзӯъи классикии пиктограммаи KDE
-Comment[tr]=KDE Klasik Simge Teması
-Comment[uk]=Класична тема піктограм KDE
-Comment[uz]=KDE klassik nishonchalar mavzusi
-Comment[uz@cyrillic]=KDE классик нишончалар мавзуси
-Comment[ven]=Thero ya Aikhono ya KDE ya tshifhinga tsho fhelaho
-Comment[vi]=Sắc thái Biểu tượng Truyền thống KDE
-Comment[xh]=Umxholo Wephawu lomfanekiso We KDE Wakudala
-Comment[zh_CN]=KDE 经典图标主题
-Comment[zh_TW]=KDE 古典圖示主題
-Comment[zu]=Ithimu Yophawu lwesithombe se-KDE Yasendulo
+Comment[nl]=Het klassieke TDE-pictogramthema
+Comment[nn]=Klassisk TDE-ikontema
+Comment[nso]=Molaetsa wa Seemedi sa Maemo a TDE
+Comment[pa]=TDE ਟਕਸਾਲੀ ਆਈਕਾਨ ਸਰੂਪ
+Comment[pl]=Klasyczny motyw ikon TDE
+Comment[pt]=Tema de Ícones Clássico do TDE
+Comment[pt_BR]=Temas de Ícones Clássico do TDE
+Comment[ro]=Tematică de iconiţe TDE clasică
+Comment[ru]=Классическая тема значков TDE
+Comment[sk]=Klasická ikonová téma TDE
+Comment[sl]=Tema klasičnih ikon TDE
+Comment[sr]=Класична TDE-ова тема икона
+Comment[sr@Latn]=Klasična TDE-ova tema ikona
+Comment[sv]=Klassiskt TDE-ikontema
+Comment[ta]=TDE பழைய சின்ன பொருள்
+Comment[tg]=Мавзӯъи классикии пиктограммаи TDE
+Comment[tr]=TDE Klasik Simge Teması
+Comment[uk]=Класична тема піктограм TDE
+Comment[uz]=TDE klassik nishonchalar mavzusi
+Comment[uz@cyrillic]=TDE классик нишончалар мавзуси
+Comment[ven]=Thero ya Aikhono ya TDE ya tshifhinga tsho fhelaho
+Comment[vi]=Sắc thái Biểu tượng Truyền thống TDE
+Comment[xh]=Umxholo Wephawu lomfanekiso We TDE Wakudala
+Comment[zh_CN]=TDE 经典图标主题
+Comment[zh_TW]=TDE 古典圖示主題
+Comment[zu]=Ithimu Yophawu lwesithombe se-TDE Yasendulo
 DisplayDepth=32
 Example=exec
 Inherits=default
diff --git a/IconThemes/locolor/index.theme b/IconThemes/locolor/index.theme
index fe14032f..278135af 100644
--- a/IconThemes/locolor/index.theme
+++ b/IconThemes/locolor/index.theme
@@ -1,48 +1,48 @@
 [Icon Theme]
-Name=KDE-LoColor
+Name=TDE-LoColor
 Name[af]=Kde-laekleur
-Name[br]=KDE-Livioù izel
-Name[ca]=KDE-baixa profunditat de color
-Name[cs]=KDE - málobarevné
-Name[cy]=Isel-liw KDE
-Name[el]=KDE-Λίγα χρώματα
-Name[en_GB]=KDE-LoColour
-Name[eo]=KDE malmultkolora
-Name[es]=KDE-baja profundidad de color
-Name[et]=KDE väheste värvidega
-Name[eu]=KDE-Kolore sakontasun baxua
-Name[fi]=KDE-vähävärinen
-Name[fo]=KDE-Fáar litir
-Name[fy]=KDE-Lege Kleuren
-Name[gl]=KDE-Cores de baixa profundidade
-Name[he]=KDE ברמת צבע נמוכה
+Name[br]=TDE-Livioù izel
+Name[ca]=TDE-baixa profunditat de color
+Name[cs]=TDE - málobarevné
+Name[cy]=Isel-liw TDE
+Name[el]=TDE-Λίγα χρώματα
+Name[en_GB]=TDE-LoColour
+Name[eo]=TDE malmultkolora
+Name[es]=TDE-baja profundidad de color
+Name[et]=TDE väheste värvidega
+Name[eu]=TDE-Kolore sakontasun baxua
+Name[fi]=TDE-vähävärinen
+Name[fo]=TDE-Fáar litir
+Name[fy]=TDE-Lege Kleuren
+Name[gl]=TDE-Cores de baixa profundidade
+Name[he]=TDE ברמת צבע נמוכה
 Name[hi]=केडीई-कम-रंग
-Name[is]=KDE-láglita
-Name[it]=KDE-Pochi colori
-Name[ja]=KDE ローカラー
-Name[ka]=მცირეფერადოვანი KDE პიქტოგრამები
-Name[lt]=KDE – mažai spalvų
-Name[mt]=KDE-Ftit Kuluri
-Name[nb]=KDE-Lavfarge
-Name[nl]=KDE-Lage Kleuren
-Name[nn]=KDE Få fargar
-Name[pl]=KDE-mało kolorów
-Name[pt_BR]=KDE-256 cores
-Name[ro]=KDE Culori puţine
-Name[ru]=Значки KDE с малым количеством цветов
-Name[sk]=KDE málo farieb
-Name[sl]=KDE - Malo barv
-Name[sr]=KDE-са мало боја
-Name[sr@Latn]=KDE-sa malo boja
-Name[sv]=KDE-färgfattig
-Name[ta]=KDE-மங்கிய வண்ணம்
-Name[tg]=Пиктограммаи KDE бо рангҳои миқдораш кам
-Name[th]=KDE แบบสีน้อย
-Name[tr]=KDE-Düşük Renk
-Name[uk]=KDE мало-колірна
-Name[zh_CN]=KDE 低色彩
-Name[zh_TW]=KDE 低彩
-Name[zu]=KDE-Lombala
+Name[is]=TDE-láglita
+Name[it]=TDE-Pochi colori
+Name[ja]=TDE ローカラー
+Name[ka]=მცირეფერადოვანი TDE პიქტოგრამები
+Name[lt]=TDE – mažai spalvų
+Name[mt]=TDE-Ftit Kuluri
+Name[nb]=TDE-Lavfarge
+Name[nl]=TDE-Lage Kleuren
+Name[nn]=TDE Få fargar
+Name[pl]=TDE-mało kolorów
+Name[pt_BR]=TDE-256 cores
+Name[ro]=TDE Culori puţine
+Name[ru]=Значки TDE с малым количеством цветов
+Name[sk]=TDE málo farieb
+Name[sl]=TDE - Malo barv
+Name[sr]=TDE-са мало боја
+Name[sr@Latn]=TDE-sa malo boja
+Name[sv]=TDE-färgfattig
+Name[ta]=TDE-மங்கிய வண்ணம்
+Name[tg]=Пиктограммаи TDE бо рангҳои миқдораш кам
+Name[th]=TDE แบบสีน้อย
+Name[tr]=TDE-Düşük Renk
+Name[uk]=TDE мало-колірна
+Name[zh_CN]=TDE 低色彩
+Name[zh_TW]=TDE 低彩
+Name[zu]=TDE-Lombala
 Comment=Lowcolor Icon Theme
 Comment[af]=Laekleur Ikoon Tema
 Comment[bg]=Тема с икони с ниско качество на цветовете (8, 16 бита)
diff --git a/README b/README
index 964bd135..21d9c0de 100644
--- a/README
+++ b/README
@@ -14,5 +14,5 @@ This package contains additional
 * widget styles and
 * window styles
 
-for KDE. We placed them into this module so that tdebase won't be too bloated.
+for TDE. We placed them into this module so that tdebase won't be too bloated.
 
diff --git a/icewm-themes/MenschMaschine/default.theme b/icewm-themes/MenschMaschine/default.theme
index 934acf97..aad50c97 100644
--- a/icewm-themes/MenschMaschine/default.theme
+++ b/icewm-themes/MenschMaschine/default.theme
@@ -1,5 +1,5 @@
 # MenschMaschine
-# by qwertz     kraftw@gmx.de   for KDE2.2
+# by qwertz     kraftw@gmx.de   for TDE2.2
 
 ThemeDescription="MenschMaschine(twin)"
 ThemeAuthor="kraftw@gmx.de"
diff --git a/icewm-themes/Model/default.theme b/icewm-themes/Model/default.theme
index ce20eea9..6569b2dc 100644
--- a/icewm-themes/Model/default.theme
+++ b/icewm-themes/Model/default.theme
@@ -1,5 +1,5 @@
 # Model
-# by qwertz     kraftw@gmx.de   for KDE2.2
+# by qwertz     kraftw@gmx.de   for TDE2.2
 
 ThemeDescription="Model(twin)"
 ThemeAuthor="kraftw@gmx.de"
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 84b8b245..3c4aa487 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -1,12 +1,12 @@
 /*
- *	KDE3 dotNET Style (version 1.5)
+ *	TDE3 dotNET Style (version 1.5)
  *	Copyright (C) 2001-2002, Chris Lee <clee@kde.org>
  *	                         Carsten Pfeiffer <pfeiffer@kde.org>
  *                           Karol Szwed <gallium@kde.org>
  *
- *	Drawing routines completely reimplemented from KDE3 HighColor, which was
- *	originally based on some stuff from the KDE2 HighColor.
- *	Includes portions of framework code from KDE3 HighColor,
+ *	Drawing routines completely reimplemented from TDE3 HighColor, which was
+ *	originally based on some stuff from the TDE2 HighColor.
+ *	Includes portions of framework code from TDE3 HighColor,
  *          (C) 2001-2002 Karol Szwed <gallium@kde.org>,
  *          (C) 2001-2002 Fredrik H�lund  <fredrik@kde.org>
  *
@@ -70,7 +70,7 @@ class dotNETstylePlugin : public TQStylePlugin
 		}
 };
 
-KDE_Q_EXPORT_PLUGIN( dotNETstylePlugin )
+TDE_Q_EXPORT_PLUGIN( dotNETstylePlugin )
 
 // ---------------------------------------------------
 
diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index 21844616..eb32a35e 100644
--- a/styles/dotnet/dotnet.h
+++ b/styles/dotnet/dotnet.h
@@ -2,7 +2,7 @@
  * $Id$
  *
  *	Copyright 2001, Chris Lee <lee@azsites.com>
- *	Originally copied from the KDE3 HighColor style, modified to fit mine.
+ *	Originally copied from the TDE3 HighColor style, modified to fit mine.
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 008e1b15..952ade00 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // phasestyle.cpp
 // -------------------
-// TQt/KDE widget style
+// TQt/TDE widget style
 // -------------------
 // Copyright (c) 2004 David Johnson
 // Please see the header file for copyright and license information.
@@ -17,7 +17,7 @@
 // differs from the TQt default of giving them PaletteButton backgrounds.
 // Menubars have normal gradients, toolbars have reverse.
 //
-// Some toolbars are not part of a TQMainWindows, such as in a KDE file dialog.
+// Some toolbars are not part of a TQMainWindows, such as in a TDE file dialog.
 // In these cases we treat the toolbar as "floating" and paint it flat.
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ PhaseStyle::PhaseStyle()
     if (gradients_) { // don't bother setting if already false
         gradients_ =
             settings.readBoolEntry("/phasestyle/Settings/gradients", true);
-        contrast = 100 + settings.readNumEntry("/TQt/KDE/contrast", 5);
+        contrast = 100 + settings.readNumEntry("/TQt/TDE/contrast", 5);
     }
     highlights_ =
         settings.readBoolEntry("/phasestyle/Settings/highlights", true);
@@ -2277,7 +2277,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
 	if (event->type() == TQEvent::Paint) {
 		// make sure we do the most specific stuff first
 	
-		// KDE Toolbar Widget
+		// TDE Toolbar Widget
 		// patch by Daniel Brownlees <dbrownlees@paradise.net.nz>
 		if (object->parent() && !qstrcmp(object->name(), KTOOLBARWIDGET)) {
 		if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false;
@@ -2485,6 +2485,6 @@ TQStyle* PhaseStylePlugin::create(const TQString& key)
     return 0;
 }
 
-KDE_Q_EXPORT_PLUGIN(PhaseStylePlugin)
+TDE_Q_EXPORT_PLUGIN(PhaseStylePlugin)
 
 #include "phasestyle.moc"
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index 8922960b..2d2273cc 100644
--- a/styles/phase/phasestyle.h
+++ b/styles/phase/phasestyle.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // phasestyle.h
 // -------------------
-// TQt/KDE widget style
+// TQt/TDE widget style
 // -------------------
 // Copyright (c) 2004 David Johnson <david@usermode.org>
 //
diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index 0357ac3c..3237439c 100644
--- a/tdescreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -3,7 +3,7 @@
 // Terence Welsh Screensaver - Euphoria
 // http://www.reallyslick.com/
 //
-// Ported to KDE by Karl Robillard
+// Ported to TDE by Karl Robillard
 //
 /*
  * Copyright (C) 2002  Terence M. Welsh
@@ -1037,7 +1037,7 @@ KEuphoriaSetup::~KEuphoriaSetup()
 void KEuphoriaSetup::slotHelp()
 {
     KMessageBox::about(this,
-        i18n("<h3>Euphoria 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"),
+        i18n("<h3>Euphoria 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to TDE by Karl Robillard</p>"),
         TQString(), KMessageBox::AllowLink);
 }
 
diff --git a/tdescreensaver/kdesavers/Euphoria.h b/tdescreensaver/kdesavers/Euphoria.h
index 26fdf27b..45ef3207 100644
--- a/tdescreensaver/kdesavers/Euphoria.h
+++ b/tdescreensaver/kdesavers/Euphoria.h
@@ -5,7 +5,7 @@
 // Terence Welsh Screensaver - Euphoria
 // http://www.reallyslick.com/
 //
-// KDE port by Karl Robillard
+// TDE port by Karl Robillard
 //
 //============================================================================
 
diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index ff5c5612..bdd358f2 100644
--- a/tdescreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -3,7 +3,7 @@
 // Terence Welsh Screensaver - Flux
 // http://www.reallyslick.com/
 //
-// Ported to KDE by Karl Robillard
+// Ported to TDE by Karl Robillard
 //
 /*
  * Copyright (C) 2002  Terence M. Welsh
@@ -918,7 +918,7 @@ KFluxSetup::~KFluxSetup()
 void KFluxSetup::slotHelp()
 {
     KMessageBox::about(this,
-        i18n("<h3>Flux 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"),
+        i18n("<h3>Flux 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to TDE by Karl Robillard</p>"),
         TQString(), KMessageBox::AllowLink);
 }
 
diff --git a/tdescreensaver/kdesavers/Flux.h b/tdescreensaver/kdesavers/Flux.h
index f1a98780..a48e85fa 100644
--- a/tdescreensaver/kdesavers/Flux.h
+++ b/tdescreensaver/kdesavers/Flux.h
@@ -5,7 +5,7 @@
 // Terence Welsh Screensaver - Flux
 // http://www.reallyslick.com/
 //
-// Ported to KDE by Karl Robillard
+// Ported to TDE by Karl Robillard
 //
 //============================================================================
 
diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index 07be1cce..a52affbc 100644
--- a/tdescreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -3,7 +3,7 @@
 // Terence Welsh Screensaver - Solar Winds
 // http://www.reallyslick.com/
 //
-// Ported to KDE by Karl Robillard
+// Ported to TDE by Karl Robillard
 //
 /*
  * Copyright (C) 2002  Terence M. Welsh
@@ -730,7 +730,7 @@ KSWindsSetup::~KSWindsSetup()
 void KSWindsSetup::slotHelp()
 {
     KMessageBox::about(this,
-        i18n("<h3>Solar Winds 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"),
+        i18n("<h3>Solar Winds 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to TDE by Karl Robillard</p>"),
         TQString(), KMessageBox::AllowLink);
 }
 
diff --git a/tdescreensaver/kdesavers/SolarWinds.h b/tdescreensaver/kdesavers/SolarWinds.h
index c8a7688a..6b5bb65d 100644
--- a/tdescreensaver/kdesavers/SolarWinds.h
+++ b/tdescreensaver/kdesavers/SolarWinds.h
@@ -5,7 +5,7 @@
 // Terence Welsh Screensaver - Solar Winds
 // http://www.reallyslick.com/
 //
-// Ported to KDE by Karl Robillard
+// Ported to TDE by Karl Robillard
 //
 //============================================================================
 
diff --git a/tdescreensaver/kdesavers/banner.h b/tdescreensaver/kdesavers/banner.h
index 6b953e58..140acfed 100644
--- a/tdescreensaver/kdesavers/banner.h
+++ b/tdescreensaver/kdesavers/banner.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kbanner - Basic screen saver for KDE
+// kbanner - Basic screen saver for TDE
 //
 // Copyright (c)  Martin R. Jones 1996
 //
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index b84fc78c..106628b0 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kblob - Basic screen saver for KDE
+// kblob - Basic screen saver for TDE
 //
 // Copyright (c)  Tiaan Wessels, 1997
 //
diff --git a/tdescreensaver/kdesavers/blob.h b/tdescreensaver/kdesavers/blob.h
index e8b8f839..3c471408 100644
--- a/tdescreensaver/kdesavers/blob.h
+++ b/tdescreensaver/kdesavers/blob.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kblob - Basic screen saver for KDE
+// kblob - Basic screen saver for TDE
 //
 // Copyright (c)  Tiaan Wessels, 1997
 //
diff --git a/tdescreensaver/kdesavers/firesaver.ChangeLog b/tdescreensaver/kdesavers/firesaver.ChangeLog
index 80461e62..19ba86a8 100644
--- a/tdescreensaver/kdesavers/firesaver.ChangeLog
+++ b/tdescreensaver/kdesavers/firesaver.ChangeLog
@@ -52,7 +52,7 @@
 	spent into GL libraries!!..) seems there's a limit to the code
 	optimization!).
 
-	* firesaver : added KDE icons as exploding elements and checked
+	* firesaver : added TDE icons as exploding elements and checked
 	the explode logo routine.
 
 	* fw_letters* : added support for overlay writings. cleaned api.
diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index 903a911e..122a83e8 100644
--- a/tdescreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -1091,7 +1091,7 @@ void KFireSaver :: readConfig ()
 		if ( config.readBoolEntry( "LogosKonqui", true ) )
 			if ( tempImage.load(locate("data","kfiresaver/kfs_kde.png")) )
 				imageList.append( new TQImage(tempImage) );
-		if ( config.readBoolEntry( "LogosKDEIcons", true ) ) {
+		if ( config.readBoolEntry( "LogosTDEIcons", true ) ) {
 			const TQString icons[] = {
 				"3floppy_unmount", "cdrom_unmount", "hdd_mount", "kmix",
 				"network", "my-computer", "folder_home", "konqueror",
diff --git a/tdescreensaver/kdesavers/firesaversetup.ui.h b/tdescreensaver/kdesavers/firesaversetup.ui.h
index a07d8896..490543c4 100644
--- a/tdescreensaver/kdesavers/firesaversetup.ui.h
+++ b/tdescreensaver/kdesavers/firesaversetup.ui.h
@@ -105,7 +105,7 @@ void KFireSaverSetup::writeConfig()
     config.writeEntry( "enable-Logos", logosBox->isChecked() );
       config.writeEntry( "LogosKonqui", logosKonquiBox->isChecked() );
       config.writeEntry( "LogosTux", logosTuxBox->isChecked() );
-      config.writeEntry( "LogosKDEIcons", logosIconsBox->isChecked() );
+      config.writeEntry( "LogosTDEIcons", logosIconsBox->isChecked() );
       config.writeEntry( "LogosReduceDetail", logosDetailBox->isChecked() );
       config.writeEntry( "LogosFrequency", logosSlider->value() );
     config.writeEntry( "enable-Stars", starsBox->isChecked() );
@@ -167,7 +167,7 @@ void KFireSaverSetup::readConfig()
     logosBox->setChecked(config.readBoolEntry( "enable-Logos", true ));
     logosKonquiBox->setChecked(config.readBoolEntry( "LogosKonqui", true ));
     logosTuxBox->setChecked(config.readBoolEntry( "LogosTux", true ));
-    logosIconsBox->setChecked(config.readBoolEntry( "LogosKDEIcons", true ));
+    logosIconsBox->setChecked(config.readBoolEntry( "LogosTDEIcons", true ));
     logosDetailBox->setChecked(config.readBoolEntry( "LogosReduceDetail", true ));
     logosSlider->setValue(config.readNumEntry( "LogosFrequency", 4 ));
     starsBox->setChecked(config.readBoolEntry( "enable-Stars", true ));
@@ -201,7 +201,7 @@ void KFireSaverSetup::useButton_clicked()
     //logosDetailBox->setChecked( );
 
     switch (ci){
-    case 0: // KDE default
+    case 0: // TDE default
 	showCombo->setCurrentItem( 1 );
 	fireworksSlider->setValue( 7 );
 	bottomfireBox->setChecked( true );
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 1350a12a..4125f95d 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kfountain - Partical Fountain Screen Saver for KDE 2
+// kfountain - Partical Fountain Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kdesavers/fountain.h b/tdescreensaver/kdesavers/fountain.h
index 492680ff..289d3649 100644
--- a/tdescreensaver/kdesavers/fountain.h
+++ b/tdescreensaver/kdesavers/fountain.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kfountain - Partical Fountain Screen Saver for KDE 2
+// kfountain - Partical Fountain Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 119224cd..411d90c6 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kgravity - Partical Gravity Screen Saver for KDE 2
+// kgravity - Partical Gravity Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kdesavers/gravity.h b/tdescreensaver/kdesavers/gravity.h
index 2d44ea64..687894c9 100644
--- a/tdescreensaver/kdesavers/gravity.h
+++ b/tdescreensaver/kdesavers/gravity.h
@@ -1,6 +1,6 @@
 ///-----------------------------------------------------------------------------
 //
-// kgravity - Partical gravity Screen Saver for KDE 2
+// kgravity - Partical gravity Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index 8cf1788a..7de25947 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
@@ -1,6 +1,6 @@
 // $Id$
 //
-// kclock - Clock screen saver for KDE
+// kclock - Clock screen saver for TDE
 // Copyright (c) 2003   Melchior FRANZ
 //
 // License:		GPL v2
diff --git a/tdescreensaver/kdesavers/kclock.h b/tdescreensaver/kdesavers/kclock.h
index d0c19e34..159adeaf 100644
--- a/tdescreensaver/kdesavers/kclock.h
+++ b/tdescreensaver/kdesavers/kclock.h
@@ -1,6 +1,6 @@
 // $Id$
 //
-// kclock - Clock screen saver for KDE
+// kclock - Clock screen saver for TDE
 // Copyright (c) 2003   Melchior FRANZ
 //
 // License:		GPL v2
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index d1384a21..afc132ed 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -1,10 +1,10 @@
 /*-
- * kvm.cpp - The Vm screensaver for KDE
+ * kvm.cpp - The Vm screensaver for TDE
  * Copyright (c) 2000 by Artur Rataj
  * This file is distributed under the terms of the GNU General Public License
  *
  * This file is partially based on kmatrix screen saver -- original copyright follows:
- * kmatrix.c - The Matrix screensaver for KDE
+ * kmatrix.c - The Matrix screensaver for TDE
  * by Eric Plante Copyright (c) 1999
  * Distributed under the Gnu Public License
  *
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index 2fb57c25..b7c5bdd9 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// klines 0.1.1 - Basic screen saver for KDE
+// klines 0.1.1 - Basic screen saver for TDE
 // by Dirk Staneker 1997
 // based on kpolygon from Martin R. Jones 1996
 // mailto:dirk.staneker@student.uni-tuebingen.de
diff --git a/tdescreensaver/kdesavers/lines.h b/tdescreensaver/kdesavers/lines.h
index f169dc7c..0d820c0e 100644
--- a/tdescreensaver/kdesavers/lines.h
+++ b/tdescreensaver/kdesavers/lines.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// klines 0.1.1 - Basic screen saver for KDE
+// klines 0.1.1 - Basic screen saver for TDE
 // by Dirk Staneker 1997
 // based on kpolygon 0.3 by Martin R. Jones 1996
 //
diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index a8aebd45..d285d2cf 100644
--- a/tdescreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KPendulum screen saver for KDE
+// KPendulum screen saver for TDE
 //
 // The screen saver displays a physically realistic simulation of a two-part
 // pendulum.
@@ -36,7 +36,7 @@
 #include <tqcolordialog.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
-// KDE headers
+// TDE headers
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -786,7 +786,7 @@ void KPendulumSetup::okButtonClickedSlot()
 void KPendulumSetup::aboutButtonClickedSlot()
 {
    KMessageBox::about(this, i18n("\
-<h3>KPendulum Screen Saver for KDE</h3>\
+<h3>KPendulum Screen Saver for TDE</h3>\
 <p>Simulation of a two-part pendulum</p>\
 <p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>\
 <p><tt>georg-d@users.sourceforge.net</tt></p>"));
diff --git a/tdescreensaver/kdesavers/pendulum.h b/tdescreensaver/kdesavers/pendulum.h
index 815e2455..ee8fa452 100644
--- a/tdescreensaver/kdesavers/pendulum.h
+++ b/tdescreensaver/kdesavers/pendulum.h
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KPendulum screen saver for KDE
+// KPendulum screen saver for TDE
 // $Id$
 // Copyright (C) 2004 Georg Drenkhahn
 //
@@ -22,7 +22,7 @@
 // GL headers
 #include <GL/glu.h>
 #include <GL/gl.h>
-// KDE headers
+// TDE headers
 #include <tdescreensaver.h>
 
 #include "vec3.h"
diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index 8ce16671..1979dfe8 100644
--- a/tdescreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kpolygon - Basic screen saver for KDE
+// kpolygon - Basic screen saver for TDE
 //
 // Copyright (c)  Martin R. Jones 1996
 //
diff --git a/tdescreensaver/kdesavers/polygon.h b/tdescreensaver/kdesavers/polygon.h
index 86c9d2aa..c0bc71a6 100644
--- a/tdescreensaver/kdesavers/polygon.h
+++ b/tdescreensaver/kdesavers/polygon.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kpolygon - Basic screen saver for KDE
+// kpolygon - Basic screen saver for TDE
 //
 // Copyright (c)  Martin R. Jones 1996
 //
diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index c960c66c..9d9a1442 100644
--- a/tdescreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KRotation screen saver for KDE
+// KRotation screen saver for TDE
 //
 // The screen saver displays a physically realistic simulation of a force free
 // rotating asymmetric body.  The equations of motion for such a rotation, the
@@ -36,7 +36,7 @@
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
-// KDE headers
+// TDE headers
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -780,7 +780,7 @@ void KRotationSetup::okButtonClickedSlot(void)
 void KRotationSetup::aboutButtonClickedSlot(void)
 {
    KMessageBox::about(this, i18n("\
-<h3>KRotation Screen Saver for KDE</h3>\
+<h3>KRotation Screen Saver for TDE</h3>\
 <p>Simulation of a force free rotating asymmetric body</p>\
 <p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>\
 <p><tt>georg-d@users.sourceforge.net</tt></p>"));
diff --git a/tdescreensaver/kdesavers/rotation.h b/tdescreensaver/kdesavers/rotation.h
index c4dde402..d8754194 100644
--- a/tdescreensaver/kdesavers/rotation.h
+++ b/tdescreensaver/kdesavers/rotation.h
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KRotation screen saver for KDE
+// KRotation screen saver for TDE
 // Copyright (C) 2004 Georg Drenkhahn
 // $Id$
 //
@@ -19,7 +19,7 @@
 // GL headers
 #include <GL/glu.h>
 #include <GL/gl.h>
-// KDE headers
+// TDE headers
 #include <tdescreensaver.h>
 
 #include "vec3.h"
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index 24309087..bd3ee4ad 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kscience - screen saver for KDE
+// kscience - screen saver for TDE
 //
 // Copyright (c)  Rene Beutler 1998
 //
diff --git a/tdescreensaver/kdesavers/science.h b/tdescreensaver/kdesavers/science.h
index eb894053..d35788b8 100644
--- a/tdescreensaver/kdesavers/science.h
+++ b/tdescreensaver/kdesavers/science.h
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------
 //
-// kscience - screen saver for KDE
+// kscience - screen saver for TDE
 //
 // copyright (c)  Rene Beutler 1998
 //
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index 066117a1..800075ca 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -1012,7 +1012,7 @@ void kSlideShowSetup::slotHelp()
 {
   TDEAboutData aboutData( "kslideshow.kss", I18N_NOOP("SlideShow"),
                        version, description, TDEAboutData::License_GPL,
-                       "(c) 1999-2003, The KDE Team" );
+                       "(c) 1999-2003, The TDE Team" );
   aboutData.addAuthor("Stefan Taferner", 0, "taferner@kde.org");
   aboutData.addAuthor("Chris Howells", 0, "howells@kde.org");
   aboutData.addAuthor("Sven Leiber", 0, "s.leiber@web.de");
diff --git a/tdescreensaver/kdesavers/sspreviewarea.cpp b/tdescreensaver/kdesavers/sspreviewarea.cpp
index 2b8b3c65..9c8bb1d5 100644
--- a/tdescreensaver/kdesavers/sspreviewarea.cpp
+++ b/tdescreensaver/kdesavers/sspreviewarea.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KRotation screen saver for KDE
+// KRotation screen saver for TDE
 // Copyright (C) 2004 Georg Drenkhahn
 // $Id$
 //
diff --git a/tdescreensaver/kdesavers/sspreviewarea.h b/tdescreensaver/kdesavers/sspreviewarea.h
index ab36c4b8..0db07cb9 100644
--- a/tdescreensaver/kdesavers/sspreviewarea.h
+++ b/tdescreensaver/kdesavers/sspreviewarea.h
@@ -1,6 +1,6 @@
 //============================================================================
 //
-// KRotation screen saver for KDE
+// KRotation screen saver for TDE
 // Copyright (C) 2004 Georg Drenkhahn
 // $Id$
 //
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index 880219bf..edc3be93 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kwave - Waveing Flag Screen Saver for KDE 2
+// kwave - Waveing Flag Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kdesavers/wave.h b/tdescreensaver/kdesavers/wave.h
index 363e8ddd..3fd9c843 100644
--- a/tdescreensaver/kdesavers/wave.h
+++ b/tdescreensaver/kdesavers/wave.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// kwave - Partical Wave Screen Saver for KDE 2
+// kwave - Partical Wave Screen Saver for TDE 2
 //
 // Copyright (c)  Ian Reinhart Geiser 2001
 //
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index fdff38e2..28e9d112 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
@@ -122,7 +122,7 @@ bool KXSConfigDialog::create()
  	    topLayout->addWidget( l );
  	}
     } else {
-        // fall back to KDE's old config files.
+        // fall back to TDE's old config files.
 	int idx = 0;
 	while (true) {
 	    TQString group = TQString("Arg%1").arg(idx);
diff --git a/tdescreensaver/kxsconfig/kxsconfig.h b/tdescreensaver/kxsconfig/kxsconfig.h
index daf3c9f8..e2629c55 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.h
+++ b/tdescreensaver/kxsconfig/kxsconfig.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp
index 294c18bd..c1e8ad46 100644
--- a/tdescreensaver/kxsconfig/kxscontrol.cpp
+++ b/tdescreensaver/kxsconfig/kxscontrol.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
diff --git a/tdescreensaver/kxsconfig/kxscontrol.h b/tdescreensaver/kxsconfig/kxscontrol.h
index acd1a664..559acc41 100644
--- a/tdescreensaver/kxsconfig/kxscontrol.h
+++ b/tdescreensaver/kxsconfig/kxscontrol.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
diff --git a/tdescreensaver/kxsconfig/kxsitem.cpp b/tdescreensaver/kxsconfig/kxsitem.cpp
index 62614cb6..fd7d9694 100644
--- a/tdescreensaver/kxsconfig/kxsitem.cpp
+++ b/tdescreensaver/kxsconfig/kxsitem.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
diff --git a/tdescreensaver/kxsconfig/kxsitem.h b/tdescreensaver/kxsconfig/kxsitem.h
index 4237e603..61fb3d56 100644
--- a/tdescreensaver/kxsconfig/kxsitem.h
+++ b/tdescreensaver/kxsconfig/kxsitem.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp
index 1d7f6cc6..cb9cc20b 100644
--- a/tdescreensaver/kxsconfig/kxsrun.cpp
+++ b/tdescreensaver/kxsconfig/kxsrun.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver launcher
+// TDE xscreensaver launcher
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 1999
 //
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
 	    item->read( config );
 	}
     } else {
-	// fall back to KDE's old config files.
+	// fall back to TDE's old config files.
 	int idx = 0;
 	while (true)
 	{
diff --git a/tdescreensaver/kxsconfig/kxsxml.cpp b/tdescreensaver/kxsconfig/kxsxml.cpp
index 6ea0c7b7..c09e3728 100644
--- a/tdescreensaver/kxsconfig/kxsxml.cpp
+++ b/tdescreensaver/kxsconfig/kxsxml.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 2002
 //
diff --git a/tdescreensaver/kxsconfig/kxsxml.h b/tdescreensaver/kxsconfig/kxsxml.h
index 4f02a33c..010ea9d2 100644
--- a/tdescreensaver/kxsconfig/kxsxml.h
+++ b/tdescreensaver/kxsconfig/kxsxml.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// KDE xscreensaver configuration dialog
+// TDE xscreensaver configuration dialog
 //
 // Copyright (c)  Martin R. Jones <mjones@kde.org> 2002
 //
diff --git a/tdescreensaver/xsavers/demowin.cpp b/tdescreensaver/xsavers/demowin.cpp
index 893885be..8008a5d4 100644
--- a/tdescreensaver/xsavers/demowin.cpp
+++ b/tdescreensaver/xsavers/demowin.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// Screen savers for KDE
+// Screen savers for TDE
 //
 // Copyright (c)  Martin R. Jones 1999
 //
diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h
index c20f5495..a19dd0a8 100644
--- a/tdescreensaver/xsavers/demowin.h
+++ b/tdescreensaver/xsavers/demowin.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// Screen savers for KDE
+// Screen savers for TDE
 //
 // Copyright (c)  Martin R. Jones 1999
 //
diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp
index d649caec..753c4dc3 100644
--- a/tdescreensaver/xsavers/main.cpp
+++ b/tdescreensaver/xsavers/main.cpp
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
 //
-// Screen savers for KDE
+// Screen savers for TDE
 //
 // Copyright (c)  Martin R. Jones 1999
 //
diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp
index c94294c5..486eac49 100644
--- a/tdescreensaver/xsavers/space.cpp
+++ b/tdescreensaver/xsavers/space.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *            kStart OpenGL screensave for KDE
+ *            kStart OpenGL screensave for TDE
  *
  * $Id$
  *
diff --git a/twin-styles/cde/config/config.h b/twin-styles/cde/config/config.h
index 3b1188d1..c281f4b7 100644
--- a/twin-styles/cde/config/config.h
+++ b/twin-styles/cde/config/config.h
@@ -1,5 +1,5 @@
-#ifndef __KDE_CDECONFIG_H
-#define __KDE_CDECONFIG_H
+#ifndef __TDE_CDECONFIG_H
+#define __TDE_CDECONFIG_H
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 0edaee15..768dbfe5 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -205,7 +205,7 @@ KDecoration* ThemeHandler::createDecoration( KDecorationBridge* bridge )
 }
 
 
-// Converts KDE style button strings to icewm style button strings
+// Converts TDE style button strings to icewm style button strings
 void ThemeHandler::convertButtons( TQString& s )
 {
 	s.replace( TQRegExp("_"), "");	// Spacer	(ignored)
@@ -250,7 +250,7 @@ void ThemeHandler::readConfig()
 		*titleButtonsLeft  = KDecoration::options()->titleButtonsLeft();
 		*titleButtonsRight = KDecoration::options()->titleButtonsRight();
 
-		// Convert KDE to icewm style buttons
+		// Convert TDE to icewm style buttons
 		convertButtons( *titleButtonsLeft );
 		convertButtons( *titleButtonsRight );
 	}
diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h
index 51821da1..a023d341 100644
--- a/twin-styles/icewm/icewm.h
+++ b/twin-styles/icewm/icewm.h
@@ -39,8 +39,8 @@
   update to support the latest icewm 1.1.X theme format may be made.
 */
 
-#ifndef __KDEGALLIUM_ICEWM_H
-#define __KDEGALLIUM_ICEWM_H
+#ifndef __TDEGALLIUM_ICEWM_H
+#define __TDEGALLIUM_ICEWM_H
 
 #include <tqbutton.h>
 #include <tqlayout.h>
diff --git a/twin-styles/kde1/kde1.desktop b/twin-styles/kde1/kde1.desktop
index ff633c91..4433a696 100644
--- a/twin-styles/kde1/kde1.desktop
+++ b/twin-styles/kde1/kde1.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=KDE 1
-Name[fa]=KDE ۱
+Name=TDE 1
+Name[fa]=TDE ۱
 Name[hi]=केडीई 1
 Name[ne]=केडीई १
-Name[th]=โปรแกรมจัดการหน้าต่าง KDE 1
+Name[th]=โปรแกรมจัดการหน้าต่าง TDE 1
 X-TDE-Library=twin3_kde1
diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index e45313f3..a24933a8 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-styles/kde1/kde1client.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************
-twin - the KDE window manager
+twin - the TDE window manager
 								
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
@@ -23,7 +23,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 const char default_left[]  = "MS";
 const char default_right[] = "H_IAX";
 
-namespace KDE1
+namespace TDE1
 {
 
 TQPixmap* close_pix = 0;
@@ -254,7 +254,7 @@ void StdClient::init()
     TQGridLayout* g = new TQGridLayout( widget(), 0, 0, 3, 2 );
     g->setRowStretch( 1, 10 );
     if( isPreview())
-        g->addWidget( new TQLabel( i18n( "<center><b>KDE 1 preview</b></center>" ), widget()), 1, 1 );
+        g->addWidget( new TQLabel( i18n( "<center><b>TDE 1 preview</b></center>" ), widget()), 1, 1 );
     else
         g->addItem( new TQSpacerItem( 0, 0 ), 1, 1 ); //no widget in the middle
     g->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding ) );
@@ -603,7 +603,7 @@ void StdToolClient::init()
     TQGridLayout* g = new TQGridLayout( widget(), 0, 0, 2 );
     g->setRowStretch( 1, 10 );
     if( isPreview())
-        g->addWidget( new TQLabel( i18n( "<center><b>KDE 1 decoration</b></center>" ), widget()), 1, 1 );
+        g->addWidget( new TQLabel( i18n( "<center><b>TDE 1 decoration</b></center>" ), widget()), 1, 1 );
     else
         g->addItem( new TQSpacerItem( 0, 0 ), 1, 1 ); //no widget in the middle
     g->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding ) );
@@ -768,8 +768,8 @@ bool StdFactory::reset( unsigned long mask )
         needHardReset = true;
 
     if( mask & ( SettingFont | SettingColors )) {
-        KDE1::delete_pixmaps();
-        KDE1::create_pixmaps();
+        TDE1::delete_pixmaps();
+        TDE1::create_pixmaps();
     }
 
     if( !needHardReset )
@@ -802,7 +802,7 @@ extern "C"
 {
 	KDE_EXPORT KDecorationFactory *create_factory()
 	{
-                return new KDE1::StdFactory();
+                return new TDE1::StdFactory();
 	}
 }
 
diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h
index 858d7f59..124ee543 100644
--- a/twin-styles/kde1/kde1client.h
+++ b/twin-styles/kde1/kde1client.h
@@ -1,5 +1,5 @@
 /*****************************************************************
-twin - the KDE window manager
+twin - the TDE window manager
 								
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
@@ -13,7 +13,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 class TQLabel;
 class TQSpacerItem;
 
-namespace KDE1 {
+namespace TDE1 {
 
 enum ButtonType {
     ButtonMenu=0,
diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index ec4ad289..5cb29d13 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-styles/kstep/nextclient.cpp
@@ -622,7 +622,7 @@ void NextClient::menuButtonPressed()
     }
 }
 
-// Copied, with minor edits, from KDEDefaultClient::slotMaximize()
+// Copied, with minor edits, from TDEDefaultClient::slotMaximize()
 void NextClient::maximizeButtonClicked()
 {
     if (button[MAXIMIZE_IDX]) {
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index c76a449f..635d0f28 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -390,7 +390,7 @@ void Manager::slotLower()
 
 void Manager::slotMaximizeClicked(ButtonState state)
 {
-#if KDE_IS_VERSION(3, 3, 0)
+#if TDE_IS_VERSION(3, 3, 0)
    maximize(state);
 #else
    switch (state)
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc
index e60b297e..dda1f1b0 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cc
+++ b/twin-styles/smooth-blend/client/smoothblend.cc
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // smoothblend.cc
 // -------------------
-// Smooth Blend window decoration for KDE
+// Smooth Blend window decoration for TDE
 // -------------------
 // Copyright (c) 2005 Ryan Nickell
 // Please see the header file for copyright and license information.
@@ -1303,7 +1303,7 @@ void smoothblendClient::showEvent(TQShowEvent *) {
 
 void smoothblendClient::maxButtonPressed() {
     if (button[ButtonMax]) {
-#if KDE_IS_VERSION(3, 3, 0)
+#if TDE_IS_VERSION(3, 3, 0)
         maximize(button[ButtonMax]->lastMousePress());
 #else
 
diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h
index 3e2dc626..c7e1d2da 100644
--- a/twin-styles/smooth-blend/client/smoothblend.h
+++ b/twin-styles/smooth-blend/client/smoothblend.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // smoothblend.h
 // -------------------
-// Smooth Blend window decoration for KDE
+// Smooth Blend window decoration for TDE
 // -------------------
 // Copyright (c) 2005 Ryan Nickell <p0z3r@users.sourceforge.net>
 //
diff --git a/wallpapers/storm_blue.jpg.desktop b/wallpapers/storm_blue.jpg.desktop
index 6f298ff5..aa94a61c 100644
--- a/wallpapers/storm_blue.jpg.desktop
+++ b/wallpapers/storm_blue.jpg.desktop
@@ -3,4 +3,4 @@ File=storm_blue.jpg
 Name=Storm Blue
 Name[ru]=Штормовая Синева
 ImageType=pixmap
-Author=paninaro (KDE-Look.org)
+Author=paninaro (TDE-Look.org)
diff --git a/wallpapers/storm_green.jpg.desktop b/wallpapers/storm_green.jpg.desktop
index f437ffb0..29b164c1 100644
--- a/wallpapers/storm_green.jpg.desktop
+++ b/wallpapers/storm_green.jpg.desktop
@@ -3,4 +3,4 @@ File=storm_green.jpg
 Name=Storm Green
 Name[ru]=Штормовая Зелень
 ImageType=pixmap
-Author=paninaro (KDE-Look.org)
+Author=paninaro (TDE-Look.org)