Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

67 files changed, 1309 insertions, 1284 deletions

diff --git a/README b/README
index 97655d8c9..e168d5577 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ libraries. Here is an overview of the directories:
     the bug.
 
 * kappfinder
-    Searches for non-KDE applications, e.g. Acrobat Reader (tm) and installs
+    Searches for non-TDE applications, e.g. Acrobat Reader (tm) and installs
     those apps under the K start button.
 
 * kate
diff --git a/applnk/kde-main.directory b/applnk/kde-main.directory
index 9e1015b29..b8870fdec 100644
--- a/applnk/kde-main.directory
+++ b/applnk/kde-main.directory
@@ -2,79 +2,79 @@
 Encoding=UTF-8
 Type=Directory
 Icon=package
-Name=KDE Menu
-Name[af]=KDE Kieslys
-Name[ar]=قائمة KDE
-Name[az]=KDE Meyusu
-Name[be]=Меню KDE
+Name=TDE Menu
+Name[af]=TDE Kieslys
+Name[ar]=قائمة TDE
+Name[az]=TDE Meyusu
+Name[be]=Меню TDE
 Name[bg]=Главно меню
 Name[bn]=কে.ডি.ই. মেনু
-Name[br]=Meuziad KDE
-Name[bs]=KDE meni
-Name[ca]=Menú de KDE
-Name[cs]=Nabídka KDE
-Name[csb]=KDE menu
-Name[cy]=Dewislen KDE
-Name[da]=KDE-Menu
-Name[de]=KDE-Menü
-Name[el]=Μενού KDE
-Name[eo]=KDEa Menuo
-Name[es]=Menú de KDE
-Name[et]=KDE menüü
-Name[eu]=KDE menua
-Name[fa]=گزینگان KDE
+Name[br]=Meuziad TDE
+Name[bs]=TDE meni
+Name[ca]=Menú de TDE
+Name[cs]=Nabídka TDE
+Name[csb]=TDE menu
+Name[cy]=Dewislen TDE
+Name[da]=TDE-Menu
+Name[de]=TDE-Menü
+Name[el]=Μενού TDE
+Name[eo]=TDEa Menuo
+Name[es]=Menú de TDE
+Name[et]=TDE menüü
+Name[eu]=TDE menua
+Name[fa]=گزینگان TDE
 Name[fi]=Valikko
-Name[fr]=Menu de KDE
-Name[fy]=KDE-menu
-Name[ga]=Roghchlár KDE
-Name[gl]=Menú de KDE
-Name[he]=תפריט KDE
+Name[fr]=Menu de TDE
+Name[fy]=TDE-menu
+Name[ga]=Roghchlár TDE
+Name[gl]=Menú de TDE
+Name[he]=תפריט TDE
 Name[hi]=केडीई मेन्यू
-Name[hr]=KDE izbornik
-Name[hsb]=KDE meni
-Name[hu]=KDE menü
-Name[id]=Menu KDE
-Name[is]=KDE valmynd
-Name[it]=Menu KDE
-Name[ja]=KDE メニュー
-Name[ka]=KDE მენიუ
-Name[kk]=KDE мәзірі
-Name[km]=ម៉ឺនុយ KDE
-Name[ko]=KDE 메뉴
-Name[lt]=KDE meniu
-Name[lv]=KDE izvēlne
-Name[mk]=KDE-мени
+Name[hr]=TDE izbornik
+Name[hsb]=TDE meni
+Name[hu]=TDE menü
+Name[id]=Menu TDE
+Name[is]=TDE valmynd
+Name[it]=Menu TDE
+Name[ja]=TDE メニュー
+Name[ka]=TDE მენიუ
+Name[kk]=TDE мәзірі
+Name[km]=ម៉ឺនុយ TDE
+Name[ko]=TDE 메뉴
+Name[lt]=TDE meniu
+Name[lv]=TDE izvēlne
+Name[mk]=TDE-мени
 Name[mn]=КДЭ цэс
-Name[ms]=Menu KDE
-Name[mt]=Menu KDE
-Name[nb]=KDE-meny
-Name[nds]=KDE-Menü
+Name[ms]=Menu TDE
+Name[mt]=Menu TDE
+Name[nb]=TDE-meny
+Name[nds]=TDE-Menü
 Name[ne]=केडीई मेनु
-Name[nl]=KDE-menu
-Name[nn]=KDE-meny
-Name[pa]=KDE ਮੇਨੂ
-Name[pl]=Menu KDE
-Name[pt]=Menu KDE
-Name[pt_BR]=Menu do KDE
-Name[ro]=Meniu KDE
-Name[ru]=Меню KDE
-Name[rw]=Ibikubiyemo bya KDE 
-Name[se]=KDE-fállu
-Name[sk]=Menu KDE
-Name[sl]=Meni KDE
-Name[sr]=KDE мени
-Name[sr@Latn]=KDE meni
-Name[sv]=KDE-meny
+Name[nl]=TDE-menu
+Name[nn]=TDE-meny
+Name[pa]=TDE ਮੇਨੂ
+Name[pl]=Menu TDE
+Name[pt]=Menu TDE
+Name[pt_BR]=Menu do TDE
+Name[ro]=Meniu TDE
+Name[ru]=Меню TDE
+Name[rw]=Ibikubiyemo bya TDE 
+Name[se]=TDE-fállu
+Name[sk]=Menu TDE
+Name[sl]=Meni TDE
+Name[sr]=TDE мени
+Name[sr@Latn]=TDE meni
+Name[sv]=TDE-meny
 Name[ta]=கேடியி பட்டி
 Name[te]=కెడిఈ పట్టీ
-Name[tg]=Менюи KDE
-Name[th]=เมนู KDE
-Name[tr]=KDE Menüsü
-Name[tt]=KDE Saylağı
-Name[uk]=Меню KDE
-Name[uz]=KDE menyu
-Name[uz@cyrillic]=KDE меню
-Name[vi]=Thực đơn KDE
-Name[wa]=Dressêye KDE
-Name[zh_CN]=KDE 菜单
-Name[zh_TW]=KDE 選單
+Name[tg]=Менюи TDE
+Name[th]=เมนู TDE
+Name[tr]=TDE Menüsü
+Name[tt]=TDE Saylağı
+Name[uk]=Меню TDE
+Name[uz]=TDE menyu
+Name[uz@cyrillic]=TDE меню
+Name[vi]=Thực đơn TDE
+Name[wa]=Dressêye TDE
+Name[zh_CN]=TDE 菜单
+Name[zh_TW]=TDE 選單
diff --git a/applnk/kde-settings-components.directory b/applnk/kde-settings-components.directory
index 4c5e37281..25d6530e9 100644
--- a/applnk/kde-settings-components.directory
+++ b/applnk/kde-settings-components.directory
@@ -1,85 +1,85 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Directory
-Name=KDE Components
-Name[af]=KDE Komponente
-Name[ar]=مكوّنات KDE
-Name[az]=KDE Tərkib Hissələri
-Name[be]=Кампаненты KDE
+Name=TDE Components
+Name[af]=TDE Komponente
+Name[ar]=مكوّنات TDE
+Name[az]=TDE Tərkib Hissələri
+Name[be]=Кампаненты TDE
 Name[bg]=Компоненти
 Name[bn]=কে.ডি.ই-র বিভিন্ন উপাদান
-Name[br]=Parzhioù KDE
-Name[bs]=KDE komponente
-Name[ca]=Components del KDE
-Name[cs]=Komponenty KDE
-Name[csb]=Dzéle KDE
-Name[cy]= Cydrannau KDE
-Name[da]=KDE-komponenter
-Name[de]=KDE-Komponenten
-Name[el]=Συστατικά του KDE
-Name[eo]=KDEaj komponentoj
-Name[es]=Componentes de KDE
-Name[et]=KDE komponendid
-Name[eu]=KDE osagaiak
-Name[fa]=مؤلفه‌های KDE
-Name[fi]=KDE-komponentit
-Name[fr]=Composants de KDE
-Name[fy]=KDE-compeninten
-Name[ga]=Comhpháirteanna KDE
-Name[gl]=Compoñentes de KDE
-Name[he]=רכיבי KDE
+Name[br]=Parzhioù TDE
+Name[bs]=TDE komponente
+Name[ca]=Components del TDE
+Name[cs]=Komponenty TDE
+Name[csb]=Dzéle TDE
+Name[cy]= Cydrannau TDE
+Name[da]=TDE-komponenter
+Name[de]=TDE-Komponenten
+Name[el]=Συστατικά του TDE
+Name[eo]=TDEaj komponentoj
+Name[es]=Componentes de TDE
+Name[et]=TDE komponendid
+Name[eu]=TDE osagaiak
+Name[fa]=مؤلفه‌های TDE
+Name[fi]=TDE-komponentit
+Name[fr]=Composants de TDE
+Name[fy]=TDE-compeninten
+Name[ga]=Comhpháirteanna TDE
+Name[gl]=Compoñentes de TDE
+Name[he]=רכיבי TDE
 Name[hi]=केडीई के घटक
-Name[hr]=KDE komponente
-Name[hsb]=KDE-komponenty
-Name[hu]=KDE-komponensek
-Name[id]=Komponen KDE
-Name[is]=KDE einingar
-Name[it]=Componenti di KDE
-Name[ja]=KDE コンポーネント
-Name[ka]=KDE კომპონენტები
-Name[kk]=KDE компоненттер
-Name[km]=សមាសភាគ KDE
-Name[ko]=KDE 구성요소
-Name[lo]=ຄອມໂພເນນຂອງ KDE
-Name[lt]=KDE komponentai
-Name[lv]=KDE Komponentes
-Name[mk]=Компоненти на KDE
+Name[hr]=TDE komponente
+Name[hsb]=TDE-komponenty
+Name[hu]=TDE-komponensek
+Name[id]=Komponen TDE
+Name[is]=TDE einingar
+Name[it]=Componenti di TDE
+Name[ja]=TDE コンポーネント
+Name[ka]=TDE კომპონენტები
+Name[kk]=TDE компоненттер
+Name[km]=សមាសភាគ TDE
+Name[ko]=TDE 구성요소
+Name[lo]=ຄອມໂພເນນຂອງ TDE
+Name[lt]=TDE komponentai
+Name[lv]=TDE Komponentes
+Name[mk]=Компоненти на TDE
 Name[mn]=КДЭ-Бүрэлдхүүнүүд
-Name[ms]=Komponen KDE
-Name[nb]=KDE-komponenter
-Name[nds]=KDE-Komponenten
-Name[ne]=KDE अवयव
-Name[nl]=KDE-componenten
-Name[nn]=KDE-komponent
-Name[nso]=Dikagare tsa KDE
-Name[pa]=KDE ਭਾਗ
-Name[pl]=Składniki KDE
-Name[pt]=Componentes do KDE
-Name[pt_BR]=Componentes do KDE
-Name[ro]=Componente KDE
+Name[ms]=Komponen TDE
+Name[nb]=TDE-komponenter
+Name[nds]=TDE-Komponenten
+Name[ne]=TDE अवयव
+Name[nl]=TDE-componenten
+Name[nn]=TDE-komponent
+Name[nso]=Dikagare tsa TDE
+Name[pa]=TDE ਭਾਗ
+Name[pl]=Składniki TDE
+Name[pt]=Componentes do TDE
+Name[pt_BR]=Componentes do TDE
+Name[ro]=Componente TDE
 Name[ru]=Компоненты
-Name[rw]=Inyangingo za KDE
-Name[se]=KDE-oasit
-Name[sk]=Komponenty KDE
-Name[sl]=Komponente KDE
-Name[sr]=KDE компоненте
-Name[sr@Latn]=KDE komponente
-Name[ss]=Tincenye te KDE 
-Name[sv]=KDE-komponenter
-Name[ta]=KDE கூறுகள்
+Name[rw]=Inyangingo za TDE
+Name[se]=TDE-oasit
+Name[sk]=Komponenty TDE
+Name[sl]=Komponente TDE
+Name[sr]=TDE компоненте
+Name[sr@Latn]=TDE komponente
+Name[ss]=Tincenye te TDE
+Name[sv]=TDE-komponenter
+Name[ta]=TDE கூறுகள்
 Name[te]=కెడిఈ అంశాలు
-Name[tg]=Қисматҳои KDE
-Name[th]=ส่วนประกอบของ KDE
-Name[tr]=KDE Bileşenleri
-Name[tt]=KDE Öleşläre
-Name[uk]=Компоненти KDE
-Name[uz]=KDE komponentlari
-Name[uz@cyrillic]=KDE компонентлари
-Name[ven]=Zwipida zwa KDE
-Name[vi]=Thành phần của KDE
-Name[wa]=Componints di KDE
-Name[xh]=Izinto ze KDE
-Name[zh_CN]=KDE 组件
-Name[zh_TW]=KDE 元件
-Name[zu]= Amalunga e-KDE
+Name[tg]=Қисматҳои TDE
+Name[th]=ส่วนประกอบของ TDE
+Name[tr]=TDE Bileşenleri
+Name[tt]=TDE Öleşläre
+Name[uk]=Компоненти TDE
+Name[uz]=TDE komponentlari
+Name[uz@cyrillic]=TDE компонентлари
+Name[ven]=Zwipida zwa TDE
+Name[vi]=Thành phần của TDE
+Name[wa]=Componints di TDE
+Name[xh]=Izinto ze TDE
+Name[zh_CN]=TDE 组件
+Name[zh_TW]=TDE 元件
+Name[zu]= Amalunga e-TDE
 Icon=blockdevice
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index 9f1df73b6..268d86e65 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -22,7 +22,7 @@ url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
 <para>Right-click the folder, select <guimenuitem>Properties</guimenuitem>,
 click on the large icon in the dialog which appears, and choose another
 icon.</para> <para>To change the icon displayed for entries in the
-<guimenu>K Menu</guimenu>, use the <application>Menu Editor</application>,
+<guimenu>TDE Menu</guimenu>, use the <application>Menu Editor</application>,
 located at <menuchoice><guisubmenu>Settings</guisubmenu><guimenuitem>Menu
 Editor</guimenuitem></menuchoice>.
 </para>
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 2ab721d3e..17b577d36 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -12,7 +12,7 @@
   <!ENTITY faq-desktop SYSTEM "desktop.docbook">
   <!ENTITY faq-winmng SYSTEM "winmng.docbook">
   <!ENTITY faq-filemng SYSTEM "filemng.docbook">
-  <!ENTITY faq-webbrowse SYSTEM "webbrowse.docbook"> 
+  <!ENTITY faq-webbrowse SYSTEM "webbrowse.docbook">
   <!ENTITY faq-configkde SYSTEM "configkde.docbook">
   <!ENTITY faq-kdeapps SYSTEM "kdeapps.docbook">
   <!ENTITY faq-nonkdeapps SYSTEM "nonkdeapps.docbook">
@@ -50,6 +50,10 @@
 <year>2003</year>
 <year>2004</year>
 <year>2005</year>
+<holder>The &kde; Team</holder>
+</copyright>
+<copyright>
+<year>2012</year>
 <holder>The &tde; Team</holder>
 </copyright>
 
diff --git a/doc/faq/nonkdeapps.docbook b/doc/faq/nonkdeapps.docbook
index 1a8ea25f7..f6e234406 100644
--- a/doc/faq/nonkdeapps.docbook
+++ b/doc/faq/nonkdeapps.docbook
@@ -4,13 +4,13 @@
  "dtd/kdex.dtd">
 -->
 
-<chapter id="non-kde-apps">
+<chapter id="non-tde-apps">
 <title>&tde; with non-&tde; applications</title>
 
 <!-- FIXME: This seems to be obsolete. The only similar option is "Apply
 *colors* to -->
 
-<!-- non-kde apps" -->
+<!-- non-tde apps" -->
 <qandaset>
 <qandaentry>
 <question>
@@ -22,7 +22,7 @@ colors!</para>
 <para>Start the <application>&tde; Control Center</application> and in
 <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>
 Colors</guimenuitem></menuchoice> uncheck the <guilabel>Apply colors to
-non-KDE applications</guilabel> checkbox and click
+non-TDE applications</guilabel> checkbox and click
 <guibutton>Apply</guibutton>.</para>
 </answer>
 </qandaentry>
diff --git a/doc/kappfinder/man-kappfinder.1.docbook b/doc/kappfinder/man-kappfinder.1.docbook
index 2552bd28e..11ef00f96 100644
--- a/doc/kappfinder/man-kappfinder.1.docbook
+++ b/doc/kappfinder/man-kappfinder.1.docbook
@@ -24,7 +24,7 @@
 <cmdsynopsis>
 <command>kappfinder</command>
 <group><option>--dir</option> <replaceable> directory</replaceable></group>
-<group><option>KDE Generic Options</option></group>
+<group><option>TDE Generic Options</option></group>
 <group><option>Qt Generic Options</option></group>
 
 </cmdsynopsis>
@@ -33,9 +33,9 @@
 <refsect1>
 <title>Description</title>
 
-<para>The KDE application findern (&kappfinder;) looks for legacy and
+<para>The TDE application finder (&kappfinder;) looks for legacy and
 third party applications that are installed on your system and adds
-them to the KDE menu system. </para>
+them to the TDE menu system. </para>
 
 </refsect1>
 
diff --git a/doc/kcontrol/colors/index.docbook b/doc/kcontrol/colors/index.docbook
index 9200cb2fd..914c59d7f 100644
--- a/doc/kcontrol/colors/index.docbook
+++ b/doc/kcontrol/colors/index.docbook
@@ -121,7 +121,7 @@ downloaded from a website.</para>
 
 <para>You can choose if you want &tde; to apply the color scheme even
 to non-&tde; applications by enabling the <guilabel>Apply colors to
-non-KDE applications</guilabel>.  Not all applications will allow
+non-TDE applications</guilabel>.  Not all applications will allow
 this, but most do.</para>
 
 </sect3>
diff --git a/doc/kcontrol/panel/index.docbook b/doc/kcontrol/panel/index.docbook
index 7fad4f775..3dcc1a31a 100644
--- a/doc/kcontrol/panel/index.docbook
+++ b/doc/kcontrol/panel/index.docbook
@@ -175,7 +175,7 @@ menu's behavior. This affects the K menu you will often use to launch
 applications, the browser menus you can use to access folders and other
 menus like the recent documents menu.</para>
 
-<para>The <guilabel>K Menu</guilabel> frame offers you some options to
+<para>The <guilabel>TDE Menu</guilabel> frame offers you some options to
 configure the <guimenu>K</guimenu> menu's functionality. This frame consists 
 of 4 items:</para>
 
@@ -215,7 +215,7 @@ terminal programs (command line interfaces).</para>
 <listitem><para><guilabel>Show side image</guilabel> will add a small
 image to the side of the menu.  This is purely decorative.</para></listitem>
 
-<listitem><para>The <guibutton>Edit K Menu</guibutton> button launches the &tde; 
+<listitem><para>The <guibutton>Edit TDE Menu</guibutton> button launches the &tde; 
 menu editor.</para></listitem>
 </itemizedlist>
 
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index a63b370ad..598ebd8d5 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -3,9 +3,11 @@
 <date>2012-02-01</date>
 <releaseinfo>R14.0.0</releaseinfo>
 </chapterinfo>
-<title>Contact the &tde; team</title>
+<title>Contact the &tde; Team</title>
 <anchor id="contact"/>
 
+<para>The Trinity team invites you to contact members.</para>
+
 <sect1 id="contact-mailinglists">
 <title>Mailing lists</title>
 
@@ -36,10 +38,11 @@ url="http://www.trinitydesktop.org/mailinglist.php">mailing list archive</ulink>
 
 <sect1 id="contact-developers">
 <title>Contacting the &tde; developers</title>
+<anchor id="links" />
 
-<para>On this page, you can find links to &tde; related web sites.</para>
+<para>On this page are links to &tde; related web sites.</para>
 
-<para>The Trinity Desktop Environment is developed by a large group of people
+<para>The Trinity Desktop Environment is developed by many people
 around the world. Our main communication channel is the Internet. For
 general questions, you will be best served by asking on the mailing
 lists mentioned in the <link linkend="contact-mailinglists">previous
@@ -48,7 +51,7 @@ found in the documentation of their individual application.</para>
 
 <para>More information about &tde; is available at &tde-http;.</para>
 
-<para><anchor id="links" />Other &tde; websites include:</para>
+<para>Other &tde; websites include:</para>
 
 <variablelist>
 <varlistentry>
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index 0edb6e9ae..e32c9d88b 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -1,10 +1,10 @@
 <chapter id="welcome-to-tde">
 <chapterinfo>
-<date>2002-01-18</date>
-<releaseinfo>3.00.00</releaseinfo>
+<date>2012-02-01</date>
+<releaseinfo>R14.0.0</releaseinfo>
 </chapterinfo>
 <title>Welcome to the Trinity Desktop Environment (&tde;)</title>
-<!-- <anchor id="welcome"/> -->
+<anchor id="welcome"/>
 
 <para>The Trinity team welcomes you to user-friendly &UNIX;desktop computing.</para>
 
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index b17b983cc..6c8d0ab93 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -306,7 +306,7 @@ Non-&tde;-applications &eg;
 <para>
 Click the &RMB; on any free space
 in &kicker; and choose <guisubmenu>Add Application to
-Panel</guisubmenu> and then <guimenuitem>Add Non-KDE
+Panel</guisubmenu> and then <guimenuitem>Add Non-TDE
 Application</guimenuitem>. In the newly appearing window, enter <guilabel>Button title</guilabel> 
 and a <guilabel>Description</guilabel> of the application in the first two text boxes. Then fill 
 in the command of the application you
@@ -331,7 +331,7 @@ and then choosing <menuchoice><guimenu>Remove from Panel</guimenu>
 removed.
 </para>
 
-<!-- NOTE: Lauri: I'd say it would confuse users if I'd mention Non-KDE-Apps -->
+<!-- NOTE: Lauri: I'd say it would confuse users if I'd mention Non-TDE-Apps -->
 <!-- explicitly here. Please add them if you think there's a need. -->
 
 </sect2>
@@ -412,13 +412,13 @@ then <guilabel>Special Buttons</guilabel> on the right top of the
 
 <variablelist>
 <varlistentry>
-<term>The <guilabel>K Menu</guilabel> Icon</term>
+<term>The <guilabel>TDE Menu</guilabel> Icon</term>
 <listitem>
 <para>
 <guiicon><inlinemediaobject><imageobject><imagedata
 fileref="k_menu_icon.png"
 format="PNG"/></imageobject></inlinemediaobject></guiicon> The
-<guiicon>K Menu icon</guiicon> is one of the most necessary icons in
+<guiicon>TDE Menu icon</guiicon> is one of the most necessary icons in
 &kicker;. As you might guess, it opens the <guimenu>K</guimenu> Menu,
 which you can learn more about in <link linkend="k-menu">The K
 Menu</link>.
@@ -1040,7 +1040,7 @@ folders and other menus like the recent documents menu.
 </para>
 
 <para>
-The <guilabel>K Menu</guilabel> frame offers you some options to
+The <guilabel>TDE Menu</guilabel> frame offers you some options to
 configure the <guimenu>K</guimenu> menu's functionality. The
 <guilabel>Bookmarks</guilabel> and <guilabel>Recent Documents</guilabel> options
 will enable submenus showing your <application>konqueror</application>
@@ -1121,10 +1121,10 @@ The different kinds of buttons are:
 
 <variablelist>
 <varlistentry>
-<term><guilabel>K Menu</guilabel> tiles</term>
+<term><guilabel>TDE Menu</guilabel> tiles</term>
 <listitem>
 <para>
-The icon for the <guiicon>K Menu</guiicon> will be displayed as a tile
+The icon for the <guiicon>TDE Menu</guiicon> will be displayed as a tile
 </para>
 </listitem>
 </varlistentry>
diff --git a/doc/kmenuedit/index.docbook b/doc/kmenuedit/index.docbook
index 809b2b400..bb5eddb60 100644
--- a/doc/kmenuedit/index.docbook
+++ b/doc/kmenuedit/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
   <!ENTITY package "tdebase">
   <!ENTITY firefox "<application>Firefox</application>">
@@ -33,12 +33,12 @@
 <date>2006-11-23</date>
 <releaseinfo>0.7 (&tde; 3.5.5)</releaseinfo>
 
-<abstract><para>&kmenuedit; allows editing of the &tde; &kmenu;. 
+<abstract><para>&kmenuedit; allows editing of the &tde; &kmenu;.
 </para></abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
-<keyword>KDE Menu Editor</keyword>
+<keyword>TDE</keyword>
+<keyword>TDE Menu Editor</keyword>
 <keyword>kmenuedit</keyword>
 <keyword>application</keyword>
 <keyword>program</keyword>
@@ -80,7 +80,7 @@ and <guimenuitem>Paste</guimenuitem> menu items</para></listitem>
 <title>A Quick Start Guide to Adding an Entry to the &kmenu;</title>
 
   <para>In this example, we will add &firefox; to the <guisubmenu>Internet</guisubmenu> submenu. <note><para>Most applications can be added with &kappfinder;, &firefox; can usually be added that way, but was used for lack of a better example.</para></note></para>
-  <para>To start off, we need to open &kmenuedit;, so &RMB; on the &kmenu;, click <guimenuitem>Menu Editor</guimenuitem> to start &kmenuedit;. After &kmenuedit; has started, select <guisubmenu>Internet</guisubmenu> as shown in picture below. 
+  <para>To start off, we need to open &kmenuedit;, so &RMB; on the &kmenu;, click <guimenuitem>Menu Editor</guimenuitem> to start &kmenuedit;. After &kmenuedit; has started, select <guisubmenu>Internet</guisubmenu> as shown in picture below.
 <screenshot>
 <screeninfo>Select <guisubmenu>Internet</guisubmenu></screeninfo>
 <mediaobject>
@@ -93,7 +93,7 @@ and <guimenuitem>Paste</guimenuitem> menu items</para></listitem>
 </mediaobject>
 </screenshot></para>
   <para>
-    Once you have selected <guisubmenu>Internet</guisubmenu>, click on <menuchoice><guimenu>File</guimenu><guimenuitem>New Item...</guimenuitem></menuchoice>, opening the <guilabel>New Item</guilabel> dialog, as shown below. Type the name of the program you want to add, in this case, type <userinput>firefox</userinput>. 
+    Once you have selected <guisubmenu>Internet</guisubmenu>, click on <menuchoice><guimenu>File</guimenu><guimenuitem>New Item...</guimenuitem></menuchoice>, opening the <guilabel>New Item</guilabel> dialog, as shown below. Type the name of the program you want to add, in this case, type <userinput>firefox</userinput>.
 <screenshot>
 <screeninfo><guilabel>New Item</guilabel> dialog</screeninfo>
 <mediaobject>
@@ -119,7 +119,7 @@ Press return, and you should see something like the picture below in the main wi
 </textobject>
 </mediaobject>
 </screenshot></para>
-  
+
 <para>
     Now lets fill in the <guilabel>Description:</guilabel>, in this case type <userinput>Web Browser</userinput>. <note><para>The description and name will be displayed on the &kmenu; as <quote>Web Browser (Firefox)</quote>.</para></note> We will need to fill in the executable name in the <guilabel>Command:</guilabel> field, in this instance we will type <userinput><command>firefox</command></userinput>.</para>
 <note><para>Following the command, you can have several place holders which will be replaced with actual values when the program is run:
@@ -148,7 +148,7 @@ Press return, and you should see something like the picture below in the main wi
 </mediaobject>
 </screenshot></para>
 
-  <para>We choose the firefox icon from the list, and press return. Your finished screen should probably look something like the screenshot below. 
+  <para>We choose the firefox icon from the list, and press return. Your finished screen should probably look something like the screenshot below.
 <screenshot>
 <screeninfo>Done screenshot</screeninfo>
 <mediaobject>
@@ -229,7 +229,7 @@ executable location.</para></listitem>
 <term><guilabel>Run in terminal</guilabel></term>
 <listitem><para>You must check this if your program requires terminal emulator
 in order to run. This mainly applies to <link
-linkend="gloss-console-application">console 
+linkend="gloss-console-application">console
 applications</link>.</para></listitem>
 </varlistentry>
 <varlistentry>
@@ -264,7 +264,7 @@ want to assign a shortcut that uses more than one key.</para>
 <para>The dialog will close when you have selected a keybinding.
 </para>
 
-</sect1> 
+</sect1>
 
 </chapter>
 
@@ -273,7 +273,7 @@ want to assign a shortcut that uses more than one key.</para>
 
 <variablelist>
 <varlistentry id="file-new-item">
-<term><menuchoice> 
+<term><menuchoice>
 <shortcut><keycombo
 action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
 <guimenu>File</guimenu> <guimenuitem>New Item...</guimenuitem>
@@ -331,7 +331,7 @@ Edit</guimenu> <guimenuitem>Cut</guimenuitem>
 you want to move menu item, you should first cut it to the clipboard, move to
 the destination place using the left panel, and use the
 <guimenuitem>Paste</guimenuitem> function to paste the menu item from the
-clipboard.</para></listitem> 
+clipboard.</para></listitem>
 </varlistentry>
 
 <varlistentry id="edit-copy">
@@ -414,7 +414,7 @@ Toolbars...</guimenuitem></menuchoice></term>
 <para>Contributors:</para>
 <itemizedlist>
 <listitem><para>&Matthias.Elter; &Matthias.Elter.mail; - Original
-Author</para> 
+Author</para>
 </listitem>
 <listitem><para>&Matthias.Ettrich; &Matthias.Ettrich.mail;</para>
 </listitem>
@@ -437,7 +437,7 @@ Author</para>
 </chapter>
 
 <glossary id="glossary">
-<title>Glossary</title> 
+<title>Glossary</title>
 
 <glossentry id="gloss-terminal-emulator">
 <glossterm>Terminal emulator</glossterm>
@@ -457,7 +457,7 @@ information or provides a control shortcut. For instance the
 <application>Clock</application> applet shows current time and date
 (and even a month diary if you click it), and <application>System
 Monitor</application> applet shows how busy your machine currently is
-in real-time.</para> </glossdef> 
+in real-time.</para> </glossdef>
 </glossentry>
 
 <glossentry id="gloss-legacy-application">
@@ -508,7 +508,7 @@ work.</para></footnote>.</para>
 
 </glossary>
 
-&documentation.index; 
+&documentation.index;
 
 </book>
 <!--
diff --git a/doc/tdeprint/getting-started.docbook b/doc/tdeprint/getting-started.docbook
index d1ed5bfd8..9ac3dec25 100644
--- a/doc/tdeprint/getting-started.docbook
+++ b/doc/tdeprint/getting-started.docbook
@@ -18,7 +18,7 @@ where you can define this: either in &kcontrol; (The <guilabel>Printing
 Manager</guilabel> section), or directly and <quote>on the fly</quote>
 from the print dialog.</para>
 
-<para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu>
 <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
 <guimenuitem>Printing Manager</guimenuitem></menuchoice>.  At the bottom
 you can see a button that lets you select which printing subsystem you
@@ -99,7 +99,7 @@ the &kprinter; dialog box.</para>
 you are ready to investigate, configure administer and work with this
 system through the &tdeprint; framework.</para>
 
-<para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu>
 <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
 <guimenuitem>Printing Manager</guimenuitem></menuchoice>.  In the right
 part of the window you will see at least 4 printers predefined.  These
diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook
index 96b409fe9..715fcaa02 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/userguide/control-center.docbook
@@ -85,7 +85,7 @@ with &tde; or you can supply your own.</para>
 There are a variety of color schemes installed with &tde; by default, and
 you can find others at kde-look.org. You can also create your own. Here you
 can also modify the contrast and choose whether you want your &tde; colors
-to be applied to non-kde applications, for a more consistant overall
+to be applied to non-TDE applications, for a more consistant overall
 appearance.</para>
 </listitem>
 </varlistentry>
diff --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index b321b0295..683c878bd 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -17,7 +17,7 @@
 <indexterm><primary>Fonts</primary></indexterm>
 
 <para>Fonts are really easy to configure in &tde;. Open up the Control
-Center (with <menuchoice><guimenu>K-Menu</guimenu><guimenuitem>Control
+Center (with <menuchoice><guimenu>TDE Menu</guimenu><guimenuitem>Control
 Center</guimenuitem></menuchoice>) and choose
 <guilabel>Font Installer</guilabel> in <guilabel>System
 Administration</guilabel>in the tree view.</para>
diff --git a/doc/userguide/printing-from-apps.docbook b/doc/userguide/printing-from-apps.docbook
index eafbcb516..213942114 100644
--- a/doc/userguide/printing-from-apps.docbook
+++ b/doc/userguide/printing-from-apps.docbook
@@ -17,7 +17,7 @@
 
 <para>Printing from &tde; apps</para>
 
-<para>Printing from non-kde apps</para>
+<para>Printing from non-TDE apps</para>
 
 </sect1>
 
diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp
index e10a1ce81..b6fb5c982 100644
--- a/drkonqi/main.cpp
+++ b/drkonqi/main.cpp
@@ -65,7 +65,7 @@ int main( int argc, char* argv[] )
      exit (255);
 
   // Make sure that DrKonqi doesn't start DrKonqi when it crashes :-]
-  setenv("KDE_DEBUG", "true", 1);
+  setenv("TDE_DEBUG", "true", 1);
   unsetenv("SESSION_MANAGER");
 
   KAboutData aboutData( "drkonqi",
diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am
index 50d1ea628..819754681 100644
--- a/kappfinder/Makefile.am
+++ b/kappfinder/Makefile.am
@@ -16,7 +16,7 @@ METASOURCES = AUTO
 install-data-local: runkappfinder_$(RUN_KAPPFINDER)
 
 runkappfinder_yes:
-	echo "Installing non-KDE applications"
+	echo "Installing non-TDE applications"
 	pwd=`pwd`; \
 	(cd $(srcdir) && $$pwd/kappfinder_install "$(DESTDIR)$(kde_appsdir)")
 
diff --git a/kappfinder/README.apps b/kappfinder/README.apps
index bd5f78e3f..520295f91 100644
--- a/kappfinder/README.apps
+++ b/kappfinder/README.apps
@@ -1,8 +1,8 @@
-The apps directory contains .desktop files for commonly used non-KDE
+The apps directory contains .desktop files for commonly used non-TDE
 programs which kappfinder installs into the applnk directory of KDE.
 
 kappfinder used to install .directory files as well because in the past the
-non-KDE applications were installed in their own directory seperated from
+non-TDE applications were installed in their own directory seperated from
 the main KDE applications. This is no longer the case, all .directory files
 are maintained in tdebase/applnk.
 
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 415cdbb65..9f67b6ede 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -50,9 +50,9 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   setCaption( i18n( "KAppfinder" ) );
   TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() );
 
-  TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE "
+  TQLabel *label = new TQLabel( i18n( "The application finder looks for non-TDE "
                                     "applications on your system and adds "
-                                    "them to the KDE menu system. "
+                                    "them to the TDE menu system. "
                                     "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
   label->setAlignment( AlignAuto | WordBreak );
   layout->addWidget( label );
@@ -284,8 +284,8 @@ void TopLevel::slotCreate()
 
   KService::rebuildKSycoca(this);
 
-  TQString message( i18n( "%n application was added to the KDE menu system.",
-                         "%n applications were added to the KDE menu system.", mAdded ) );
+  TQString message( i18n( "%n application was added to the TDE menu system.",
+                         "%n applications were added to the TDE menu system.", mAdded ) );
   KMessageBox::information( this, message, TQString::null, "ShowInformation" );
 }
 
diff --git a/kcheckpass/kcheckpass.c b/kcheckpass/kcheckpass.c
index 6a0550969..75e972760 100644
--- a/kcheckpass/kcheckpass.c
+++ b/kcheckpass/kcheckpass.c
@@ -358,10 +358,10 @@ main(int argc, char **argv)
 
 #ifdef ACCEPT_ENV
 # ifdef HAVE_PAM
-  if ((p = getenv("KDE_PAM_ACTION")))
+  if ((p = getenv("TDE_PAM_ACTION")))
     caller = p;
 # endif
-  if ((p = getenv("KCHECKPASS_USER")))
+  if ((p = getenv("TCHECKPASS_USER")))
     username = p;
 #endif  
 
diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc
index 185460ec4..5154b72dd 100644
--- a/kcontrol/access/eventsrc
+++ b/kcontrol/access/eventsrc
@@ -1,68 +1,68 @@
 [!Global!]
 IconName=kaccess
-Comment=KDE Accessibility Tool
-Comment[af]=KDE toeganklikheid program
-Comment[be]=Інструмент даступнасці KDE
+Comment=Accessibility Tool
+Comment[af]=toeganklikheid program
+Comment[be]=Інструмент даступнасці
 Comment[bg]=Равностоен достъп
 Comment[bn]=কে.ডি.ই. সহায়ক প্রযুক্তি টুল
-Comment[br]=Ostilh haezadusted KDE
-Comment[bs]=KDE alat za pristupačnost
-Comment[ca]=Eina d'accessibilitat KDE
-Comment[cs]=KDE nástroj pro zpřístupnění
-Comment[csb]=Nôrzãdze pòmòcë przistãpù KDE
-Comment[cy]=Erfyn Hygyrchedd KDE
-Comment[da]=KDE Tilgængelighedsværktøj
-Comment[de]=KDE-Dienstprogramm für Zugangshilfen
-Comment[el]=Εργαλείο προσβασιμότητας του KDE
-Comment[eo]=KDE-ilo por Alirebleco
-Comment[es]=Herramienta de accesibilidad de KDE
-Comment[et]=KDE hõlbustusvahend
-Comment[eu]=KDEren erabilerraztasun tresna
-Comment[fa]=ابزار دستیابی‌پذیری KDE
-Comment[fi]=KDE:n helppokäyttötoiminnot
-Comment[fr]=Outil d'accessibilité de KDE
-Comment[fy]=KDE Tagonklikens
-Comment[ga]=Uirlis Inrochtaineachta KDE
-Comment[gl]=Ferramenta de Acesibilidade de KDE
-Comment[he]=כלי הנגישות של KDE
-Comment[hr]=KDE alat pristupačnosti
-Comment[hu]=KDE kezelési segédeszköz
-Comment[is]=KDE aðgengistól
-Comment[it]=Strumento per l'accessibilità di KDE
-Comment[ja]=KDE アクセシビリティ支援ツール
-Comment[ka]=KDE დამხმარე საშუალებები
-Comment[kk]=KDE арнайы мүмкіндіктері
-Comment[km]=ឧបករណ៍​មធ្យោបាយ​ងាយស្រួល KDE
-Comment[ko]=KDE 접근성 도구
-Comment[mk]=Алатка за пристапливост во KDE
-Comment[ms]=Alatan Kebolehcapaian KDE
-Comment[nb]=Tilgjengelighetsverktøy for KDE
-Comment[nds]=KDE-Warktüüch för Behinnerte
-Comment[ne]=KDE पहुँचयोग्य उपकरण
-Comment[nl]=KDE Toegankelijkheid
-Comment[nn]=Tilgjengeverktøy for KDE
-Comment[pa]=KDE ਸਹੂਲਤ ਸੰਦ
-Comment[pl]=Narzędzie ułatwień dostępu KDE
-Comment[pt]=Ferramenta de Acessibilidade do KDE
-Comment[pt_BR]=Ferramenta de Acessibilidade do KDE
-Comment[ro]=Utilitar de accesibilitate pentru KDE
+Comment[br]=Ostilh haezadusted
+Comment[bs]=alat za pristupačnost
+Comment[ca]=Eina d'accessibilitat
+Comment[cs]=nástroj pro zpřístupnění
+Comment[csb]=Nôrzãdze pòmòcë przistãpù
+Comment[cy]=Erfyn Hygyrchedd
+Comment[da]=Tilgængelighedsværktøj
+Comment[de]=Dienstprogramm für Zugangshilfen
+Comment[el]=Εργαλείο προσβασιμότητας του
+Comment[eo]=ilo por Alirebleco
+Comment[es]=Herramienta de accesibilidad de
+Comment[et]=hõlbustusvahend
+Comment[eu]=ren erabilerraztasun tresna
+Comment[fa]=ابزار دستیابی‌پذیری
+Comment[fi]=helppokäyttötoiminnot
+Comment[fr]=Outil d'accessibilité de
+Comment[fy]=Tagonklikens
+Comment[ga]=Uirlis Inrochtaineachta
+Comment[gl]=Ferramenta de Acesibilidade de
+Comment[he]=כלי הנגישות של
+Comment[hr]=alat pristupačnosti
+Comment[hu]=kezelési segédeszköz
+Comment[is]=aðgengistól
+Comment[it]=Strumento per l'accessibilità di
+Comment[ja]=アクセシビリティ支援ツール
+Comment[ka]=დამხმარე საშუალებები
+Comment[kk]=арнайы мүмкіндіктері
+Comment[km]=ឧបករណ៍​មធ្យោបាយ​ងាយស្រួល
+Comment[ko]=접근성 도구
+Comment[mk]=Алатка за пристапливост во
+Comment[ms]=Alatan Kebolehcapaian
+Comment[nb]=Tilgjengelighetsverktøy for
+Comment[nds]=Warktüüch för Behinnerte
+Comment[ne]=पहुँचयोग्य उपकरण
+Comment[nl]=Toegankelijkheid
+Comment[nn]=Tilgjengeverktøy for
+Comment[pa]=ਸਹੂਲਤ ਸੰਦ
+Comment[pl]=Narzędzie ułatwień dostępu
+Comment[pt]=Ferramenta de Acessibilidade do
+Comment[pt_BR]=Ferramenta de Acessibilidade do
+Comment[ro]=Utilitar de accesibilitate pentru
 Comment[ru]=Специальные возможности
-Comment[se]=KDE reaidu álkkibut geavaheami várás
-Comment[sk]=Nástroj na sprístupnenie KDE
-Comment[sl]=Orodje za dostopnost KDE
-Comment[sr]=KDE алатка за приступачност
-Comment[sr@Latn]=KDE alatka za pristupačnost
-Comment[sv]=Handikappverktyg för KDE
-Comment[tg]=Барномаи Тавонёбии KDE
-Comment[th]=เครื่องมือช่วยใช้งานโปรแกรม KDE
-Comment[tr]=KDE Erişilebilirlik Aracı
-Comment[uk]=Засіб доступності для KDE
-Comment[uz]=KDE qulaylik vositasi
-Comment[uz@cyrillic]=KDE қулайлик воситаси
-Comment[vi]=Công cụ hỗ trợ người tàn tật cho KDE
-Comment[wa]=Usteye d' accessibilité KDE
-Comment[zh_CN]=KDE 辅助工具
-Comment[zh_TW]=KDE 無障礙工具
+Comment[se]=reaidu álkkibut geavaheami várás
+Comment[sk]=Nástroj na sprístupnenie
+Comment[sl]=Orodje za dostopnost
+Comment[sr]=алатка за приступачност
+Comment[sr@Latn]=alatka za pristupačnost
+Comment[sv]=Handikappverktyg för
+Comment[tg]=Барномаи Тавонёбии
+Comment[th]=เครื่องมือช่วยใช้งานโปรแกรม
+Comment[tr]=Erişilebilirlik Aracı
+Comment[uk]=Засіб доступності для
+Comment[uz]=qulaylik vositasi
+Comment[uz@cyrillic]=қулайлик воситаси
+Comment[vi]=Công cụ hỗ trợ người tàn tật cho
+Comment[wa]=Usteye d' accessibilité
+Comment[zh_CN]=辅助工具
+Comment[zh_TW]=無障礙工具
 
 [modifierkey-latched]
 Name=A modifier key has become active
@@ -1060,7 +1060,7 @@ Comment[sl]=Miškine tipke so spremenile stanje in so sedaj omogočene ali onemo
 Comment[sr]=Тастери за миш су укључени или искључени
 Comment[sr@Latn]=Tasteri za miš su uključeni ili isključeni
 Comment[sv]=Mustangenter har aktiverats eller inaktiverats
-Comment[tg]=Тугмачаҳои мушуак фаъол ё ғайрифаъол мебошанд 
+Comment[tg]=Тугмачаҳои мушуак фаъол ё ғайрифаъол мебошанд
 Comment[th]=ปุ่มแทนเมาส์ได้ถูกใช้งาน หรือ ถูกปิด
 Comment[uk]=Клавіші мишки було увімкнено або вимкнено
 Comment[vi]=Các phím chuột đã được bật hoặc đã được tắt
diff --git a/kcontrol/access/kaccess.desktop b/kcontrol/access/kaccess.desktop
index 6fbd7f668..0c8beba88 100644
--- a/kcontrol/access/kaccess.desktop
+++ b/kcontrol/access/kaccess.desktop
@@ -1,77 +1,77 @@
 [Desktop Entry]
 Type=Service
-Name=KDE Accessibility Tool
-Name[af]=KDE toeganklikheid program
-Name[ar]=أداة KDE لتسهيل الوصول
-Name[az]=KDE Yetişmə Qabiliyyəti Vasitəsi
-Name[be]=Інструмент даступнасці KDE
+Name=Accessibility Tool
+Name[af]=toeganklikheid program
+Name[ar]=أداة لتسهيل الوصول
+Name[az]=Yetişmə Qabiliyyəti Vasitəsi
+Name[be]=Інструмент даступнасці
 Name[bg]=Равностоен достъп
 Name[bn]=কে.ডি.ই. সহায়ক প্রযুক্তি টুল
-Name[br]=Ostilh haezadusted KDE
-Name[bs]=KDE alat za pristupačnost
-Name[ca]=Eina d'accessibilitat KDE
-Name[cs]=Nástroj pro zpřístupnění prostředí KDE
-Name[csb]=Pòmòce przistãpù KDE
-Name[cy]=Erfyn Hygyrchedd KDE
-Name[da]=KDE Tilgængelighedsværktøj
-Name[de]=KDE-Zugangshilfe
-Name[el]=Εργαλείο προσιτότητας του KDE
-Name[eo]=KDE-ilo por Alirebleco
-Name[es]=Herramienta de accesibilidad de KDE
-Name[et]=KDE hõlbustusvahend
-Name[eu]=KDEren erabilerraztasun tresna
-Name[fa]=ابزار دستیابی‌پذیری KDE
-Name[fi]=KDE:n helppokäyttötoiminnot
-Name[fr]=Outil d'accessibilité de KDE
-Name[fy]=KDE Tagonklikens
-Name[ga]=Uirlis Inrochtaineachta KDE
-Name[gl]=Ferramenta de Acesibilidade de KDE
-Name[he]=כלי הנגישות של KDE
+Name[br]=Ostilh haezadusted
+Name[bs]=alat za pristupačnost
+Name[ca]=Eina d'accessibilitat
+Name[cs]=Nástroj pro zpřístupnění prostředí
+Name[csb]=Pòmòce przistãpù
+Name[cy]=Erfyn Hygyrchedd
+Name[da]=Tilgængelighedsværktøj
+Name[de]=Zugangshilfe
+Name[el]=Εργαλείο προσιτότητας του
+Name[eo]=ilo por Alirebleco
+Name[es]=Herramienta de accesibilidad de
+Name[et]=hõlbustusvahend
+Name[eu]=ren erabilerraztasun tresna
+Name[fa]=ابزار دستیابی‌پذیری
+Name[fi]=helppokäyttötoiminnot
+Name[fr]=Outil d'accessibilité de
+Name[fy]=Tagonklikens
+Name[ga]=Uirlis Inrochtaineachta
+Name[gl]=Ferramenta de Acesibilidade de
+Name[he]=כלי הנגישות של
 Name[hi]=केडीई एक्सेसिबिलिटी औजार
-Name[hr]=KDE pristupačnost
-Name[hu]=KDE kezelési segédeszköz
-Name[is]=KDE aðgengistól
-Name[it]=Strumento per l'accessibilità di KDE
-Name[ja]=KDE アクセシビリティ支援ツール
-Name[ka]=KDE-ს სპეცეციალური შესაძლებლობების ხელსაწყოები
-Name[kk]=KDE арнайы мүмкіндіктер құралы
-Name[km]=ឧបករណ៍​មធ្យោបាយងាយស្រួល KDE
-Name[ko]=KDE 접근성 도구
-Name[lt]=KDE prieinamumo įrankis
-Name[lv]=KDE pieejamības rīks
-Name[mk]=Алатка за пристапливост во KDE
-Name[ms]=Alat Keaksesan KDE
-Name[mt]=Għodda KDE għall-aċċessibbiltà
-Name[nb]=Tilgjengelighetsverktøy for KDE
-Name[nds]=KDE-Warktüüch för Behinnerte
-Name[ne]=KDE पहुँचयोग्य उपकरण
-Name[nl]=KDE Toegankelijkheid
-Name[nn]=Tilgjengeverktøy for KDE
-Name[pa]=KDE ਸਹਾਇਕ ਸੰਦ
-Name[pl]=Ułatwienia dostępu KDE
-Name[pt]=Ferramenta de Acessibilidade do KDE
-Name[pt_BR]=Ferramenta de Acessibilidade do KDE
-Name[ro]=Utilitar de accesibilitate pentru KDE
+Name[hr]=pristupačnost
+Name[hu]=kezelési segédeszköz
+Name[is]=aðgengistól
+Name[it]=Strumento per l'accessibilità di
+Name[ja]=アクセシビリティ支援ツール
+Name[ka]=ს სპეცეციალური შესაძლებლობების ხელსაწყოები
+Name[kk]=арнайы мүмкіндіктер құралы
+Name[km]=ឧបករណ៍​មធ្យោបាយងាយស្រួល
+Name[ko]=접근성 도구
+Name[lt]=prieinamumo įrankis
+Name[lv]=pieejamības rīks
+Name[mk]=Алатка за пристапливост во
+Name[ms]=Alat Keaksesan
+Name[mt]=Għodda għall-aċċessibbilt�
+Name[nb]=Tilgjengelighetsverktøy for
+Name[nds]=Warktüüch för Behinnerte
+Name[ne]=पहुँचयोग्य उपकरण
+Name[nl]=Toegankelijkheid
+Name[nn]=Tilgjengeverktøy for
+Name[pa]=ਸਹਾਇਕ ਸੰਦ
+Name[pl]=Ułatwienia dostępu
+Name[pt]=Ferramenta de Acessibilidade do
+Name[pt_BR]=Ferramenta de Acessibilidade do
+Name[ro]=Utilitar de accesibilitate pentru
 Name[ru]=Специальные возможности
-Name[rw]=Igikoresho cy'Ukugerwaho cya KDE
-Name[se]=KDE reaidu álkkibut geavaheami várás
-Name[sk]=KDE sprístupnenie
-Name[sl]=Orodje za dostopnost KDE
-Name[sr]=KDE алатка за приступачност
-Name[sr@Latn]=KDE alatka za pristupačnost
-Name[sv]=Handikappverktyg för KDE
-Name[ta]=KDE அணுகும் கருவி
-Name[tg]=Барномаи Тавонёбии KDE
-Name[th]=เครื่องมือปรับแต่งการช่วยใารใช้ของงาน KDE
-Name[tr]=KDE Erişilebilirlik Aracı
-Name[tt]=KDE'neñ Qulaylıq Qoralı
-Name[uk]=Утиліта керування доступності KDE
-Name[uz]=KDE qulaylik vositasi
-Name[uz@cyrillic]=KDE қулайлик воситаси
-Name[vi]=Công cụ hỗ trợ người tàn tật cho KDE
-Name[wa]=Usteye d' accessibilité KDE
-Name[zh_CN]=KDE 辅助工具
-Name[zh_TW]=KDE 無障礙工具
+Name[rw]=Igikoresho cy'Ukugerwaho cya
+Name[se]=reaidu álkkibut geavaheami várás
+Name[sk]=sprístupnenie
+Name[sl]=Orodje za dostopnost
+Name[sr]=алатка за приступачност
+Name[sr@Latn]=alatka za pristupačnost
+Name[sv]=Handikappverktyg för
+Name[ta]=அணுகும் கருவி
+Name[tg]=Барномаи Тавонёбии
+Name[th]=เครื่องมือปรับแต่งการช่วยใารใช้ของงาน
+Name[tr]=Erişilebilirlik Aracı
+Name[tt]=neñ Qulaylıq Qoralı
+Name[uk]=Утиліта керування доступності
+Name[uz]=qulaylik vositasi
+Name[uz@cyrillic]=қулайлик воситаси
+Name[vi]=Công cụ hỗ trợ người tàn tật cho
+Name[wa]=Usteye d' accessibilité
+Name[zh_CN]=辅助工具
+Name[zh_TW]=無障礙工具
 Exec=kaccess
 X-DCOP-ServiceType=None
 X-KDE-ParentApp=kcontrol
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 3a67306a6..fc310df11 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -107,7 +107,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " which can also be modified or deleted. KDE comes with several"
        " predefined color schemes on which you can base your own.<p>"
        " All KDE applications will obey the selected color scheme."
-       " Non-KDE applications may also obey some or all of the color"
+       " Non-TDE applications may also obey some or all of the color"
        " settings, if this option is enabled."));
 
     KConfig *cfg = new KConfig("kcmdisplayrc");
@@ -270,12 +270,12 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     label->setText(i18n("High Contrast", "High"));
     groupLayout->addWidget( label );
 
-    cbExportColors = new TQCheckBox(i18n("Apply colors to &non-KDE applications"), this);
+    cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this);
     topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 );
     connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
 
     TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the"
-       " current color scheme to non-KDE applications."));
+       " current color scheme to non-TDE applications."));
 
     load();
 
diff --git a/kcontrol/icons/icons.desktop b/kcontrol/icons/icons.desktop
index 966b377b9..b3ef9d4cd 100644
--- a/kcontrol/icons/icons.desktop
+++ b/kcontrol/icons/icons.desktop
@@ -92,87 +92,87 @@ Name[zh_CN]=图标
 Name[zh_TW]=圖示
 Name[zu]=Izimpawu zezithombe
 
-Comment=Customize KDE Icons
+Comment=Customize TDE Icons
 Comment[af]=Pasmaak Kde Ikoone
-Comment[ar]=تخصيص أيقونات KDE الإعتيادية
-Comment[az]=KDE Timsallarını Xüsusiləşdirir
-Comment[be]=Настаўленні значак KDE
+Comment[ar]=تخصيص أيقونات TDE الإعتيادية
+Comment[az]=TDE Timsallarını Xüsusiləşdirir
+Comment[be]=Настаўленні значак TDE
 Comment[bg]=Настройване и избор на тема с икони
 Comment[bn]=কে.ডি.ই. আইকন বেছে নিন
-Comment[br]=Neuziañ arlunioù KDE
-Comment[bs]=Podesite KDE ikone
-Comment[ca]=Configura les icones del KDE
-Comment[cs]=Přizpůsobení ikon KDE
-Comment[csb]=Dopasëjë ikònë KDE
-Comment[cy]=Addasu Eiconau KDE
-Comment[da]=Brugerdefinér KDE-ikoner
-Comment[de]=KDE-Symbole einrichten
-Comment[el]=Προσαρμογή των εικονιδίων του KDE
-Comment[en_GB]=Customise KDE Icons
-Comment[eo]=Agordo de KDE-piktogramoj
-Comment[es]=Personaliza los iconos de KDE
-Comment[et]=KDE ikoonide kohandamine
-Comment[eu]=Pertsonalizatu KDEren ikonoak
-Comment[fa]=سفارشی‌سازی شمایلهای KDE
-Comment[fi]=Muokkaa KDE:n kuvakkeita
-Comment[fr]=Personnalisation des icônes de KDE
-Comment[fy]=KDE-byldkaikes oanpasse
-Comment[ga]=Saincheap Deilbhíní KDE
-Comment[gl]=Personaliza as Iconas de KDE
-Comment[he]=שינוי הגדרות הסמלים של KDE
+Comment[br]=Neuziañ arlunioù TDE
+Comment[bs]=Podesite TDE ikone
+Comment[ca]=Configura les icones del TDE
+Comment[cs]=Přizpůsobení ikon TDE
+Comment[csb]=Dopasëjë ikònë TDE
+Comment[cy]=Addasu Eiconau TDE
+Comment[da]=Brugerdefinér TDE-ikoner
+Comment[de]=TDE-Symbole einrichten
+Comment[el]=Προσαρμογή των εικονιδίων του TDE
+Comment[en_GB]=Customise TDE Icons
+Comment[eo]=Agordo de TDE-piktogramoj
+Comment[es]=Personaliza los iconos de TDE
+Comment[et]=TDE ikoonide kohandamine
+Comment[eu]=Pertsonalizatu TDEren ikonoak
+Comment[fa]=سفارشی‌سازی شمایلهای TDE
+Comment[fi]=Muokkaa TDE:n kuvakkeita
+Comment[fr]=Personnalisation des icônes de TDE
+Comment[fy]=TDE-byldkaikes oanpasse
+Comment[ga]=Saincheap Deilbhíní TDE
+Comment[gl]=Personaliza as Iconas de TDE
+Comment[he]=שינוי הגדרות הסמלים של TDE
 Comment[hi]=केडीई प्रतीक मनपसंद बनाएँ
-Comment[hr]=Prilagođavanje KDE ikona
-Comment[hu]=A KDE ikonok testreszabása
-Comment[id]=Customize Ikon KDE
-Comment[is]=Stilla táknmyndir KDE
-Comment[it]=Personalizza le icone di KDE
-Comment[ja]=KDE アイコンをカスタマイズ
-Comment[ka]=KDE–ს ხატულების კონფიგურაცია
-Comment[kk]=KDE таңбашаларын баптау
-Comment[km]=ប្ដូរ​រូបតំណាង KDE តាម​បំណង
-Comment[ko]=KDE 아이콘 사용자 정의
-Comment[lo]=ເລືອກໄອຄອນຂອງ KDE ເອງ
-Comment[lt]=KDE ženkliukų derinimas
-Comment[lv]=Pielāgot KDE Ikonas
-Comment[mk]=Прилагоди ги иконите на KDE
+Comment[hr]=Prilagođavanje TDE ikona
+Comment[hu]=A TDE ikonok testreszabása
+Comment[id]=Customize Ikon TDE
+Comment[is]=Stilla táknmyndir TDE
+Comment[it]=Personalizza le icone di TDE
+Comment[ja]=TDE アイコンをカスタマイズ
+Comment[ka]=TDE–ს ხატულების კონფიგურაცია
+Comment[kk]=TDE таңбашаларын баптау
+Comment[km]=ប្ដូរ​រូបតំណាង TDE តាម​បំណង
+Comment[ko]=TDE 아이콘 사용자 정의
+Comment[lo]=ເລືອກໄອຄອນຂອງ TDE ເອງ
+Comment[lt]=TDE ženkliukų derinimas
+Comment[lv]=Pielāgot TDE Ikonas
+Comment[mk]=Прилагоди ги иконите на TDE
 Comment[mn]=КДЭ-Тэмдэг тохируулах
-Comment[ms]=Ikon KDE Langganan
-Comment[mt]=Agħżel ikoni ġodda għal KDE
-Comment[nb]=Tilpass ikonene i KDE
-Comment[nds]=Lüttbiller för KDE utsöken
+Comment[ms]=Ikon TDE Langganan
+Comment[mt]=Agħżel ikoni ġodda għal TDE
+Comment[nb]=Tilpass ikonene i TDE
+Comment[nds]=Lüttbiller för TDE utsöken
 Comment[ne]=केडीई प्रतिमा अनुकूलन गर्नुहोस्
-Comment[nl]=KDE-pictogrammen aanpassen
-Comment[nn]=Tilpass KDE-ikon
-Comment[nso]=Amanya Diemedi tsa KDE
-Comment[oc]=Configura les icones KDE
-Comment[pa]=KDE ਆਈਕਾਨ ਪਸੰਦ
-Comment[pl]=Dostosuj ikony KDE
-Comment[pt]=Alterar os Ícones do KDE
-Comment[pt_BR]=Personalizar os ícones do KDE
-Comment[ro]=Personalizează iconițele KDE
+Comment[nl]=TDE-pictogrammen aanpassen
+Comment[nn]=Tilpass TDE-ikon
+Comment[nso]=Amanya Diemedi tsa TDE
+Comment[oc]=Configura les icones TDE
+Comment[pa]=TDE ਆਈਕਾਨ ਪਸੰਦ
+Comment[pl]=Dostosuj ikony TDE
+Comment[pt]=Alterar os Ícones do TDE
+Comment[pt_BR]=Personalizar os ícones do TDE
+Comment[ro]=Personalizează iconițele TDE
 Comment[ru]=Настройка значков
-Comment[rw]=Kugena imiterere y'udushushondanga twa KDE
-Comment[se]=Heivet KDE-govažiid
-Comment[sk]=Zmena ikon v KDE
-Comment[sl]=Nastavitve ikon za KDE
-Comment[sr]=Прилагоди KDE иконе
-Comment[sr@Latn]=Prilagodi KDE ikone
-Comment[sv]=Anpassa KDE:s ikoner
-Comment[ta]=KDE சின்னங்களை தனதாக்கு
-Comment[tg]=Мизроб кардани нишонаҳои KDE
-Comment[th]=กำหนดไอคอนของ KDE
-Comment[tr]=KDE Simgelerini Özelleştirir
-Comment[tt]=KDE İkonnarın caylaw
-Comment[uk]=Налаштування піктограм KDE
-Comment[uz]=KDE nishonchalarini moslash
-Comment[uz@cyrillic]=KDE нишончаларини мослаш
-Comment[ven]=Customize dziaikhonu dza KDE
-Comment[vi]=Tuỳ chọn các Biểu tượng của KDE
-Comment[wa]=Imådjetes KDE da vosse
-Comment[xh]=Yenza Imphawu zomfanekiso ze KDE Ngokwemfuneko
-Comment[zh_CN]=定制 KDE 图标
-Comment[zh_TW]=自訂 KDE 圖示
-Comment[zu]=Yenza Izimpawu zezithombe ze-KDE ngokwemfuneko
+Comment[rw]=Kugena imiterere y'udushushondanga twa TDE
+Comment[se]=Heivet TDE-govažiid
+Comment[sk]=Zmena ikon v TDE
+Comment[sl]=Nastavitve ikon za TDE
+Comment[sr]=Прилагоди TDE иконе
+Comment[sr@Latn]=Prilagodi TDE ikone
+Comment[sv]=Anpassa TDE:s ikoner
+Comment[ta]=TDE சின்னங்களை தனதாக்கு
+Comment[tg]=Мизроб кардани нишонаҳои TDE
+Comment[th]=กำหนดไอคอนของ TDE
+Comment[tr]=TDE Simgelerini Özelleştirir
+Comment[tt]=TDE İkonnarın caylaw
+Comment[uk]=Налаштування піктограм TDE
+Comment[uz]=TDE nishonchalarini moslash
+Comment[uz@cyrillic]=TDE нишончаларини мослаш
+Comment[ven]=Customize dziaikhonu dza TDE
+Comment[vi]=Tuỳ chọn các Biểu tượng của TDE
+Comment[wa]=Imådjetes TDE da vosse
+Comment[xh]=Yenza Imphawu zomfanekiso ze TDE Ngokwemfuneko
+Comment[zh_CN]=定制 TDE 图标
+Comment[zh_TW]=自訂 TDE 圖示
+Comment[zu]=Yenza Izimpawu zezithombe ze-TDE ngokwemfuneko
 
 Keywords=icons,effects,size,hicolor,locolor
 Keywords[ar]=icons,effects,size,hicolor,locolor,أيقونات,تأثيرات,حجم لون عالي,لون مخفض,الحجم,التأثيرات,الأيقونات
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index b4b2e11f6..c31aaf85f 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -82,7 +82,7 @@ void CommandShortcutsModule::initGUI()
     KActiveLabel* label = new KActiveLabel(this);
     label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. "
                         "To edit, add or remove entries from this list use the "
-                        "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>"));
+                        "<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>"));
     label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
     disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
     connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
@@ -139,7 +139,7 @@ void CommandShortcutsModule::launchMenuEditor()
                                                   true /*nowait*/ ) != 0 )
     {
         KMessageBox::error(this,
-                           i18n("The KDE menu editor (kmenuedit) could not be launched.\n"
+                           i18n("The TDE menu editor (kmenuedit) could not be launched.\n"
                            "Perhaps it is not installed or not in your path."),
                            i18n("Application Missing"));
     }
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 2ded51364..d69481f21 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -77,7 +77,7 @@
                 <cstring>m_kmenuGroup</cstring>
             </property>
             <property name="title">
-                <string>K Menu</string>
+                <string>TDE Menu</string>
             </property>
             <hbox>
                 <property name="name">
@@ -127,7 +127,7 @@
                                         <string>&amp;Name only</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's name next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's name next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="2" column="1">
@@ -141,7 +141,7 @@
                                         <bool>true</bool>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's name and a brief description next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's name and a brief description next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="3" column="1">
@@ -152,7 +152,7 @@
                                         <string>D&amp;escription only</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's brief description next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's brief description next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="4" column="1">
@@ -166,7 +166,7 @@
                                         <string>Des&amp;cription (Name)</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with a brief description and the application's name in brackets next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with a brief description and the application's name in brackets next to the icon.</string>
                                     </property>
                                 </widget>
                             </grid>
@@ -182,9 +182,9 @@
                                 <bool>true</bool>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>&lt;qt&gt;When this option is selected an image will appear down the left-hand side of the K Menu. The image will be tinted according to your color settings.
+                                <string>&lt;qt&gt;When this option is selected an image will appear down the left-hand side of the TDE Menu. The image will be tinted according to your color settings.
                                     
-                                    &lt;p&gt;&lt;b&gt;Tip&lt;/b&gt;: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.&lt;/qt&gt;</string>
+                                    &lt;p&gt;&lt;b&gt;Tip&lt;/b&gt;: You can customize the image that appears in the TDE Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.&lt;/qt&gt;</string>
                             </property>
                         </widget>
                         <spacer>
@@ -209,13 +209,13 @@
 					<cstring>kcfg_ShowKMenuText</cstring>
 				</property>
 				<property name="text">
-					<string>Display text in K Menu button</string>
+					<string>Display text in TDE Menu button</string>
 				</property>
 				<property name="checked">
 					<bool>true</bool>
 				</property>
 				<property name="whatsThis" stdset="0">
-					<string>&lt;qt&gt;When this option is selected the text below will be shown in the K Menu button.</string>
+					<string>&lt;qt&gt;When this option is selected the text below will be shown in the TDE Menu button.</string>
 				</property>
 			</widget>
 			<grid>
@@ -246,7 +246,7 @@
 						</sizepolicy>
 					</property>
 					<property name="text">
-						<string>K Menu button icon:</string>
+						<string>TDE Menu button icon:</string>
 					</property>
 				</widget>
 				<widget class="KPushButton" row="3" column="3" colspan="2">
@@ -358,10 +358,10 @@
                                 <cstring>m_editKMenuButton</cstring>
                             </property>
                             <property name="text">
-                                <string>Edit &amp;K Menu</string>
+                                <string>Edit &amp;TDE Menu</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Start the editor for the K menu. Here you can add, edit, remove and hide applications.</string>
+                                <string>Start the editor for the TDE Menu. Here you can add, edit, remove and hide applications.</string>
                             </property>
                         </widget>
                     </vbox>
@@ -668,7 +668,7 @@
 				<cstring>m_pSearchGroup</cstring>
 			</property>
 			<property name="title">
-				<string>K Menu Search</string>
+				<string>TDE Menu Search</string>
 			</property>
 			<grid>
 				<property name="name">
@@ -679,13 +679,13 @@
 						<cstring>kcfg_UseSearchBar</cstring>
 					</property>
 					<property name="text">
-						<string>Show search field in K Menu</string>
+						<string>Show search field in TDE Menu</string>
 					</property>
 					<property name="checked">
 						<bool>true</bool>
 					</property>
 					<property name="whatsThis" stdset="0">
-						<string>&lt;qt&gt;When this option is selected a text-based search field will appear in the K Menu.&lt;/qt&gt;</string>
+						<string>&lt;qt&gt;When this option is selected a text-based search field will appear in the TDE Menu.&lt;/qt&gt;</string>
 					</property>
 				</widget>
 				<spacer row="0" column="1" rowspan="3" colspan="1">
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 35a89acfc..35ebdd6af 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -273,7 +273,7 @@ void MenuTab::launchMenuEditor()
                                                   true /*nowait*/ ) != 0 )
     {
         KMessageBox::error(this,
-                           i18n("The KDE menu editor (kmenuedit) could not be launched.\n"
+                           i18n("The TDE menu editor (kmenuedit) could not be launched.\n"
                            "Perhaps it is not installed or not in your path."),
                            i18n("Application Missing"));
     }
diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README
index a051becc7..830ba77b4 100644
--- a/kcontrol/krdb/ad/README
+++ b/kcontrol/krdb/ad/README
@@ -49,7 +49,7 @@ The krdb utility works by putting your current KDE color
 and font scheme into preprocessor statements, concatenating
 the specially written application default files and using
 xrdb -merge to write to RESOURCE_MANAGER. Thus it gives a
-simple way to make non-KDE applications fit in with the
+simple way to make non-TDE applications fit in with the
 desktop.
 
 krdb now comes with a set of general purpose configuration
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 60ee13bfe..d966af4cf 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -3,7 +3,7 @@
 **
 ** KRDB - puts current KDE color scheme into preprocessor statements
 ** cats specially written application default files and uses xrdb -merge to
-** write to RESOURCE_MANAGER. Thus it gives a  simple way to make non-KDE
+** write to RESOURCE_MANAGER. Thus it gives a  simple way to make non-TDE
 ** applications fit in with the desktop
 **
 ** Copyright (C) 1998 by Mark Donohoe
@@ -345,7 +345,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version
             "#\n"
             "# If you do not want KDE to override your GTK settings, select\n"
             "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
-            "# \"Apply colors to non-KDE applications\"\n"
+            "# \"Apply colors to non-TDE applications\"\n"
             "#\n"
             "#\n").arg(TQDateTime::currentDateTime().toString());
 
diff --git a/kcontrol/kthememanager/kthememanager.desktop b/kcontrol/kthememanager/kthememanager.desktop
index d4c37c965..91fab2a91 100644
--- a/kcontrol/kthememanager/kthememanager.desktop
+++ b/kcontrol/kthememanager/kthememanager.desktop
@@ -1,71 +1,71 @@
 [Desktop Entry]
-Comment=Manage global KDE visual themes
-Comment[af]=Bestuurder KDE se globale visuele temas
-Comment[az]=Qlobal KDE əyani örtüklərini idarə et
-Comment[be]=Кіраванне глабальнымі візуальнымі тэмамі KDE
+Comment=Manage global TDE visual themes
+Comment[af]=Bestuurder TDE se globale visuele temas
+Comment[az]=Qlobal TDE əyani örtüklərini idarə et
+Comment[be]=Кіраванне глабальнымі візуальнымі тэмамі TDE
 Comment[bg]=Управление на темите
 Comment[bn]=গ্লোবাল কে.ডি.ই. ভিসুয়াল থীম ব্যবস্থাপনা
-Comment[bs]=Upravljanje globalnim KDE vizuelnim temama
-Comment[ca]=Gestiona els temes visuals globals del KDE
+Comment[bs]=Upravljanje globalnim TDE vizuelnim temama
+Comment[ca]=Gestiona els temes visuals globals del TDE
 Comment[cs]=Správce motivů pracovní plochy
-Comment[csb]=Sprôwiôj témą KDE
-Comment[cy]=Rheoli themau gweledol KDE eang
-Comment[da]=Håndtering af globale visuelle temaer for KDE
-Comment[de]=Globale KDE-Designs verwalten
-Comment[el]=Διαχειριστής καθολικών οπτικών θεμάτων του KDE
-Comment[eo]=Administras mondan KDEan etosoj
-Comment[es]=Gestión global de los temas visuales de KDE
-Comment[et]=KDE globaalsete teemade haldur
-Comment[eu]=Kudeatu KDEren gai bisual orokorrak
-Comment[fa]=مدیریت چهره‌های مرئی KDE سراسری
-Comment[fi]=Ylläpidä KDE:n teemoja
-Comment[fr]=Gestionnaire de thèmes visuels globaux de KDE
-Comment[fy]=Algemiene fisuele tema's fan KDE beheare
-Comment[gl]=Xestionar temas visuais globais de KDE
-Comment[he]=מנהל ערכות נושא גלובליות עבור KDE
+Comment[csb]=Sprôwiôj témą TDE
+Comment[cy]=Rheoli themau gweledol TDE eang
+Comment[da]=Håndtering af globale visuelle temaer for TDE
+Comment[de]=Globale TDE-Designs verwalten
+Comment[el]=Διαχειριστής καθολικών οπτικών θεμάτων του TDE
+Comment[eo]=Administras mondan TDEan etosoj
+Comment[es]=Gestión global de los temas visuales de TDE
+Comment[et]=TDE globaalsete teemade haldur
+Comment[eu]=Kudeatu TDEren gai bisual orokorrak
+Comment[fa]=مدیریت چهره‌های مرئی TDE سراسری
+Comment[fi]=Ylläpidä TDE:n teemoja
+Comment[fr]=Gestionnaire de thèmes visuels globaux de TDE
+Comment[fy]=Algemiene fisuele tema's fan TDE beheare
+Comment[gl]=Xestionar temas visuais globais de TDE
+Comment[he]=מנהל ערכות נושא גלובליות עבור TDE
 Comment[hi]=वैश्विक केडीई दृश्यमय प्रसंग प्रबंधित करें
-Comment[hr]=Upravljanje općim KDE vizualnim temama
-Comment[hu]=KDE-témák kezelése
-Comment[is]=Stjórna víðværum KDE þemum
-Comment[it]=Gestore dei temi globali di KDE
-Comment[ja]=グローバル KDE 外観テーマの管理
-Comment[ka]=KDE-ს ვიზუალური თემბის გლობალური მენეჯმენტი
-Comment[kk]=KDE жалпы көрініс нақыштарын басқару
-Comment[km]=គ្រប់គ្រង​ស្បែក​រូបភាព KDE ទាំងអស់
-Comment[ko]=전역 KDE 시각 테마 관리
-Comment[lt]=Globaliai tvarkyti KDE vizualines temas
-Comment[lv]=KDE izskata tēmu pārvaldīšana
-Comment[mk]=Менаџирајте ги глобалните KDE визуелни теми
-Comment[ms]=Urus tema visual KDE global
-Comment[mt]=Immaniġġja temi viżwali globali tal-KDE
-Comment[nb]=Velg blant KDE-temaer for hele brukerflaten
-Comment[nds]=Globale KDE-Muster instellen
-Comment[ne]=विश्वव्यापी KDE दृश्य विषयवस्तु व्यवस्थापन गर्नुहोस्
-Comment[nl]=Algemene visuele thema's van KDE beheren
-Comment[nn]=Vel mellom KDE-tema for heile brukarflata
-Comment[pa]=ਮੁੱਢਲੇ KDE ਦਿੱਖ ਸਰੂਪ ਪਰਬੰਧ
-Comment[pl]=Zarządzaj motywami KDE
-Comment[pt]=Gestão global de temas visuais do KDE
-Comment[pt_BR]=Gerencia temas globais do KDE
-Comment[ro]=Administrează tematicile vizuale KDE globale
-Comment[ru]=Менеджер глобальных визуальных тем KDE
-Comment[rw]=Kuyobora insanganyamatsiko igaragara KDE rusange
-Comment[se]=Hálddaš oppalaš visuella KDE-fáttáid
+Comment[hr]=Upravljanje općim TDE vizualnim temama
+Comment[hu]=TDE-témák kezelése
+Comment[is]=Stjórna víðværum TDE þemum
+Comment[it]=Gestore dei temi globali di TDE
+Comment[ja]=グローバル TDE 外観テーマの管理
+Comment[ka]=TDE-ს ვიზუალური თემბის გლობალური მენეჯმენტი
+Comment[kk]=TDE жалпы көрініс нақыштарын басқару
+Comment[km]=គ្រប់គ្រង​ស្បែក​រូបភាព TDE ទាំងអស់
+Comment[ko]=전역 TDE 시각 테마 관리
+Comment[lt]=Globaliai tvarkyti TDE vizualines temas
+Comment[lv]=TDE izskata tēmu pārvaldīšana
+Comment[mk]=Менаџирајте ги глобалните TDE визуелни теми
+Comment[ms]=Urus tema visual TDE global
+Comment[mt]=Immaniġġja temi viżwali globali tal-TDE
+Comment[nb]=Velg blant TDE-temaer for hele brukerflaten
+Comment[nds]=Globale TDE-Muster instellen
+Comment[ne]=विश्वव्यापी TDE दृश्य विषयवस्तु व्यवस्थापन गर्नुहोस्
+Comment[nl]=Algemene visuele thema's van TDE beheren
+Comment[nn]=Vel mellom TDE-tema for heile brukarflata
+Comment[pa]=ਮੁੱਢਲੇ TDE ਦਿੱਖ ਸਰੂਪ ਪਰਬੰਧ
+Comment[pl]=Zarządzaj motywami TDE
+Comment[pt]=Gestão global de temas visuais do TDE
+Comment[pt_BR]=Gerencia temas globais do TDE
+Comment[ro]=Administrează tematicile vizuale TDE globale
+Comment[ru]=Менеджер глобальных визуальных тем TDE
+Comment[rw]=Kuyobora insanganyamatsiko igaragara TDE rusange
+Comment[se]=Hálddaš oppalaš visuella TDE-fáttáid
 Comment[sk]=Globálny správca tém
-Comment[sl]=Upravitelj vizualnih tem za KDE
-Comment[sr]=Управљање KDE-овим визуелним темама
-Comment[sr@Latn]=Upravljanje KDE-ovim vizuelnim temama
-Comment[sv]=Hantera KDE:s allmänna visuella teman
-Comment[ta]=பொது KDE காட்சி பொருளை மேல்பார்வையிடு
-Comment[tg]=Мудири мавзӯъҳои визуалии KDE дар шабака
-Comment[th]=จัดการชุดตกแต่งของ KDE
-Comment[tr]=Evrensel KDE ekran temalarını yönet
-Comment[tt]=KDE'nıñ tışlaw törlären caylaw idäräse
-Comment[uk]=Керування глобальними темами KDE
-Comment[vi]=Trình quản lý các sắc thái của KDE
-Comment[wa]=Manaedjî tinmes pol rivnance globåle di KDE
-Comment[zh_CN]=管理全局 KDE 视觉主题
-Comment[zh_TW]=管理全域 KDE 視覺佈景
+Comment[sl]=Upravitelj vizualnih tem za TDE
+Comment[sr]=Управљање TDE-овим визуелним темама
+Comment[sr@Latn]=Upravljanje TDE-ovim vizuelnim temama
+Comment[sv]=Hantera TDE:s allmänna visuella teman
+Comment[ta]=பொது TDE காட்சி பொருளை மேல்பார்வையிடு
+Comment[tg]=Мудири мавзӯъҳои визуалии TDE дар шабака
+Comment[th]=จัดการชุดตกแต่งของ TDE
+Comment[tr]=Evrensel TDE ekran temalarını yönet
+Comment[tt]=TDE'nıñ tışlaw törlären caylaw idäräse
+Comment[uk]=Керування глобальними темами TDE
+Comment[vi]=Trình quản lý các sắc thái của TDE
+Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE
+Comment[zh_CN]=管理全局 TDE 视觉主题
+Comment[zh_TW]=管理全域 TDE 視覺佈景
 Exec=kcmshell kthememanager
 Icon=kthememgr
 Keywords=themes,look and feel
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index b85dca5d8..11ea51438 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -45,8 +45,8 @@ namespace KCMPerformance
 Config::Config( TQWidget* parent_P, const char* )
     : KCModule( parent_P, "kcmperformance" )
     {
-    setQuickHelp( i18n( "<h1>KDE Performance</h1>"
-        " You can configure settings that improve KDE performance here." ));
+    setQuickHelp( i18n( "<h1>TDE Performance</h1>"
+        " You can configure settings that improve TDE performance here." ));
     
     TQVBoxLayout *topLayout = new TQVBoxLayout( this );
     TQTabWidget* tabs = new TQTabWidget( this );
diff --git a/kcontrol/performance/kcmperformance.desktop b/kcontrol/performance/kcmperformance.desktop
index bcc60face..8547472ad 100644
--- a/kcontrol/performance/kcmperformance.desktop
+++ b/kcontrol/performance/kcmperformance.desktop
@@ -8,150 +8,150 @@ X-KDE-Library=performance
 X-KDE-FactoryName=performance
 X-KDE-ParentApp=kcontrol
 
-Name=KDE Performance
-Name[af]=KDE Werkverrigting
-Name[ar]=إداء KDE
-Name[az]=KDE Keyfiyyəti
-Name[be]=Хуткасць працы KDE
+Name=TDE Performance
+Name[af]=TDE Werkverrigting
+Name[ar]=إداء TDE
+Name[az]=TDE Keyfiyyəti
+Name[be]=Хуткасць працы TDE
 Name[bg]=Производителност
 Name[bn]=কে.ডি.ই. কার্যকারীতা
-Name[bs]=KDE performanse
-Name[ca]=Rendiment del KDE
-Name[cs]=Výkon KDE
-Name[csb]=Spòrosc KDE
-Name[cy]=Perfformiad KDE
-Name[da]=KDE's ydelse
-Name[de]=KDE-Leistung
-Name[el]=Απόδοση του KDE
-Name[eo]=KDEa potenco
-Name[es]=Rendimiento de KDE
-Name[et]=KDE jõudlus
-Name[eu]=KDEren performantzia
-Name[fa]=کارایی KDE
+Name[bs]=TDE performanse
+Name[ca]=Rendiment del TDE
+Name[cs]=Výkon TDE
+Name[csb]=Spòrosc TDE
+Name[cy]=Perfformiad TDE
+Name[da]=TDE's ydelse
+Name[de]=TDE-Leistung
+Name[el]=Απόδοση του TDE
+Name[eo]=TDEa potenco
+Name[es]=Rendimiento de TDE
+Name[et]=TDE jõudlus
+Name[eu]=TDEren performantzia
+Name[fa]=کارایی TDE
 Name[fi]=Suorituskyky
-Name[fr]=Performance de KDE
-Name[fy]=KDE-prestaasjes
-Name[ga]=Feidhmiúchán KDE
-Name[gl]=Rendemento de KDE
-Name[he]=ביצועי KDE
+Name[fr]=Performance de TDE
+Name[fy]=TDE-prestaasjes
+Name[ga]=Feidhmiúchán TDE
+Name[gl]=Rendemento de TDE
+Name[he]=ביצועי TDE
 Name[hi]=केडीई परफार्मेंस
-Name[hr]=KDE performanse
+Name[hr]=TDE performanse
 Name[hu]=Teljesítményhangolás
-Name[is]=Afkastastillingar KDE
-Name[it]=Prestazioni di KDE
-Name[ja]=KDE パフォーマンス
-Name[ka]=KDE-ს წარმადობა
-Name[kk]=KDE жылдамдығы
-Name[km]=ដំណើរការ​របស់ KDE
-Name[ko]=KDE 성능
-Name[lt]=KDE našumas
-Name[lv]=KDE Veiktspēja
-Name[mk]=Перформанси на KDE
+Name[is]=Afkastastillingar TDE
+Name[it]=Prestazioni di TDE
+Name[ja]=TDE パフォーマンス
+Name[ka]=TDE-ს წარმადობა
+Name[kk]=TDE жылдамдығы
+Name[km]=ដំណើរការ​របស់ TDE
+Name[ko]=TDE 성능
+Name[lt]=TDE našumas
+Name[lv]=TDE Veiktspēja
+Name[mk]=Перформанси на TDE
 Name[mn]=КДЭ-Удирдлагын самбар
-Name[ms]=Prestasi KDE
-Name[mt]=Effiċjenza KDE
-Name[nb]=KDE-ytelse
-Name[nds]=KDE-Leisten
-Name[ne]=KDE सम्पादन
-Name[nl]=KDE-prestaties
-Name[nn]=KDE-yting
-Name[pa]=KDE ਪਰਦਰਸ਼ਨ
-Name[pl]=Wydajność KDE
-Name[pt]=Performance do KDE
-Name[pt_BR]=Performance do KDE
-Name[ro]=Performanță KDE
+Name[ms]=Prestasi TDE
+Name[mt]=Effiċjenza TDE
+Name[nb]=TDE-ytelse
+Name[nds]=TDE-Leisten
+Name[ne]=TDE सम्पादन
+Name[nl]=TDE-prestaties
+Name[nn]=TDE-yting
+Name[pa]=TDE ਪਰਦਰਸ਼ਨ
+Name[pl]=Wydajność TDE
+Name[pt]=Performance do TDE
+Name[pt_BR]=Performance do TDE
+Name[ro]=Performanță TDE
 Name[ru]=Быстродействие
-Name[rw]=Imikorere ya KDE
-Name[se]=KDE-buktu
-Name[sk]=Výkon KDE
-Name[sl]=Zmogljivost KDE
-Name[sr]=KDE перформансе
-Name[sr@Latn]=KDE performanse
-Name[sv]=KDE-prestanda
-Name[ta]=KDE செயல்திறன்
-Name[tg]=Амалкарди KDE
-Name[th]=ประสิทธิภาพของ KDE
-Name[tr]=KDE Performansı
-Name[tt]=KDE Citezlege
-Name[uk]=Швидкодія KDE
-Name[uz]=KDE unumdorligi
-Name[uz@cyrillic]=KDE унумдорлиги
-Name[vi]=Hiệu năng KDE
-Name[wa]=Improuver KDE
-Name[zh_CN]=KDE 性能
-Name[zh_TW]=KDE 效能
+Name[rw]=Imikorere ya TDE
+Name[se]=TDE-buktu
+Name[sk]=Výkon TDE
+Name[sl]=Zmogljivost TDE
+Name[sr]=TDE перформансе
+Name[sr@Latn]=TDE performanse
+Name[sv]=TDE-prestanda
+Name[ta]=TDE செயல்திறன்
+Name[tg]=Амалкарди TDE
+Name[th]=ประสิทธิภาพของ TDE
+Name[tr]=TDE Performansı
+Name[tt]=TDE Citezlege
+Name[uk]=Швидкодія TDE
+Name[uz]=TDE unumdorligi
+Name[uz@cyrillic]=TDE унумдорлиги
+Name[vi]=Hiệu năng TDE
+Name[wa]=Improuver TDE
+Name[zh_CN]=TDE 性能
+Name[zh_TW]=TDE 效能
 
-Comment=Configure settings that can improve KDE performance
-Comment[af]=Stel instellings op wat KDE se werkverrigting kan verhoog
-Comment[ar]=إعداد تعيينات تحسّن إداء KDE
-Comment[be]=Настаўленне параметраў, якія могуць павялічыць хуткасць працы KDE
+Comment=Configure settings that can improve TDE performance
+Comment[af]=Stel instellings op wat TDE se werkverrigting kan verhoog
+Comment[ar]=إعداد تعيينات تحسّن إداء TDE
+Comment[be]=Настаўленне параметраў, якія могуць павялічыць хуткасць працы TDE
 Comment[bg]=Настройване производителността на системата
 Comment[bn]=কে.ডি.ই-এর কার্যকারীতা বর্ধন করতে পারে এমন সব সেটিংস কনফিগার করুন
-Comment[bs]=Postavke koje mogu unaprijediti performanse KDEa
-Comment[ca]=Configura les opcions per a millorar el rendiment del KDE
-Comment[cs]=Nastavení vylepšující výkon KDE
-Comment[csb]=Kònfigùracëjô nastôwów Konquerora jaczé nają cësk na spòrosc KDE
-Comment[cy]=Ffurfweddu gosodiadau sy'n gallu gwella perfformiad KDE
-Comment[da]=Indstil opsætning for at forbedre KDE's ydelse
-Comment[de]=Einstellungen vornehmen, die die Leistungsfähigkeit von KDE erhöhen können
-Comment[el]=Αλλάξτε ρυθμίσεις που μπορεί να βελτιώσουν την απόδοση του KDE
-Comment[eo]=Agordo de plibonigo de la KDEa potenco
-Comment[es]=Configura opciones que pueden mejorar el rendimiento de KDE
-Comment[et]=Siin saad seadistada, kuidas KDE kõigega paremini toime tuleks
+Comment[bs]=Postavke koje mogu unaprijediti performanse TDEa
+Comment[ca]=Configura les opcions per a millorar el rendiment del TDE
+Comment[cs]=Nastavení vylepšující výkon TDE
+Comment[csb]=Kònfigùracëjô nastôwów Konquerora jaczé nają cësk na spòrosc TDE
+Comment[cy]=Ffurfweddu gosodiadau sy'n gallu gwella perfformiad TDE
+Comment[da]=Indstil opsætning for at forbedre TDE's ydelse
+Comment[de]=Einstellungen vornehmen, die die Leistungsfähigkeit von TDE erhöhen können
+Comment[el]=Αλλάξτε ρυθμίσεις που μπορεί να βελτιώσουν την απόδοση του TDE
+Comment[eo]=Agordo de plibonigo de la TDEa potenco
+Comment[es]=Configura opciones que pueden mejorar el rendimiento de TDE
+Comment[et]=Siin saad seadistada, kuidas TDE kõigega paremini toime tuleks
 Comment[eu]=Konfiguratu Konquerorren performantzia hobe dezaketen ezarpenak
-Comment[fa]=پیکربندی تنظیماتی که کارایی KDE را بهبود می‌بخشد
-Comment[fi]=Muokkaa KDE:n suorituskykyyn liittyviä asetuksia
-Comment[fr]=Configuration de paramètres qui peuvent améliorer les performances de KDE
-Comment[fy]=Hjir kinne jo ynstellings kiezen die de prestaasje fan KDE kinne ferbetterje
-Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán KDE
-Comment[gl]=Configuración das opcións que poden mellorar o rendemento de KDE
-Comment[he]=הגדר הגדרות שעשויות לשפר את ביצועי KDE
+Comment[fa]=پیکربندی تنظیماتی که کارایی TDE را بهبود می‌بخشد
+Comment[fi]=Muokkaa TDE:n suorituskykyyn liittyviä asetuksia
+Comment[fr]=Configuration de paramètres qui peuvent améliorer les performances de TDE
+Comment[fy]=Hjir kinne jo ynstellings kiezen die de prestaasje fan TDE kinne ferbetterje
+Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán TDE
+Comment[gl]=Configuración das opcións que poden mellorar o rendemento de TDE
+Comment[he]=הגדר הגדרות שעשויות לשפר את ביצועי TDE
 Comment[hi]=विन्यास कॉन्फ़िगर करें ताकि केडीई का कार्य बेहतर हो सके
-Comment[hr]=Konfiguriranje postavi koje mogu poboljšati performanse KDE-a
-Comment[hu]=A KDE teljesítményét befolyásoló paraméterek beállítása
-Comment[is]=Stillingar sem varða afköst KDE
-Comment[it]=Configura le impostazioni che possono migliorare le prestazioni di KDE
-Comment[ja]=KDE のパフォーマンスを改善
-Comment[ka]=KDE-ს სისწრაფეზე მოქმედი პარამეტრების კონფიგურაცია
-Comment[kk]=KDE жылдамдығын арттыратын параметрлерді баптау
-Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​កំណត់​ដែល​អាច​បង្កើន​ដំណើរការ​របស់ KDE
-Comment[ko]=KDE 성능 향상 설정
-Comment[lt]=Konfigūruoti nustatymus, kurie gali pagerinti KDE veikimo spartą
+Comment[hr]=Konfiguriranje postavi koje mogu poboljšati performanse TDE-a
+Comment[hu]=A TDE teljesítményét befolyásoló paraméterek beállítása
+Comment[is]=Stillingar sem varða afköst TDE
+Comment[it]=Configura le impostazioni che possono migliorare le prestazioni di TDE
+Comment[ja]=TDE のパフォーマンスを改善
+Comment[ka]=TDE-ს სისწრაფეზე მოქმედი პარამეტრების კონფიგურაცია
+Comment[kk]=TDE жылдамдығын арттыратын параметрлерді баптау
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​កំណត់​ដែល​អាច​បង្កើន​ដំណើរការ​របស់ TDE
+Comment[ko]=TDE 성능 향상 설정
+Comment[lt]=Konfigūruoti nustatymus, kurie gali pagerinti TDE veikimo spartą
 Comment[lv]=Konfigurē parametrus, kas ietekmē Iekarotāja veiktspēju
-Comment[mk]=Конфигурирајте ги поставувањата што може да ги подобрат перформансите на KDE
+Comment[mk]=Конфигурирајте ги поставувањата што може да ги подобрат перформансите на TDE
 Comment[mn]=Comment=КДЭ чадал сайжруулалтыг тохируулах
-Comment[ms]=Konfigur seting yang boleh meningkatkan prestasi KDE
-Comment[mt]=Ikkonfigura setings li jistgħu itejbu l-veloċità ta' KDE
-Comment[nb]=Innstillinger som kan forbedre KDEs ytelse
-Comment[nds]=Mit disse Instellen kannst Du de Leisten vun KDE verbetern
-Comment[ne]=KDE सम्पादन सुधार गर्न सक्ने सेटिङ कन्फिगर गर्नुहोस्
-Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van KDE kunnen verbeteren
-Comment[nn]=Innstillingar som kan forbetra ytinga til KDE
-Comment[pa]=ਸੰਰਚਨਾ ਸੈਟ ਕਰੋ, ਜਿਸ ਨਾਲ KDE ਦਾ ਪਰਦਰਸ਼ਨ ਵਧਿਆ ਹੋ ਸਕਦਾ ਹੈ
-Comment[pl]=Konfiguracja ustawień, które mogą mieć wpływ na wydajność KDE
-Comment[pt]=Configura as opções que podem aumentar a performance do KDE
-Comment[pt_BR]=Configurações que podem aumentar a performance do KDE
+Comment[ms]=Konfigur seting yang boleh meningkatkan prestasi TDE
+Comment[mt]=Ikkonfigura setings li jistgħu itejbu l-veloċità ta' TDE
+Comment[nb]=Innstillinger som kan forbedre TDEs ytelse
+Comment[nds]=Mit disse Instellen kannst Du de Leisten vun TDE verbetern
+Comment[ne]=TDE सम्पादन सुधार गर्न सक्ने सेटिङ कन्फिगर गर्नुहोस्
+Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van TDE kunnen verbeteren
+Comment[nn]=Innstillingar som kan forbetra ytinga til TDE
+Comment[pa]=ਸੰਰਚਨਾ ਸੈਟ ਕਰੋ, ਜਿਸ ਨਾਲ TDE ਦਾ ਪਰਦਰਸ਼ਨ ਵਧਿਆ ਹੋ ਸਕਦਾ ਹੈ
+Comment[pl]=Konfiguracja ustawień, które mogą mieć wpływ na wydajność TDE
+Comment[pt]=Configura as opções que podem aumentar a performance do TDE
+Comment[pt_BR]=Configurações que podem aumentar a performance do TDE
 Comment[ro]=Configurează setări care pot îmbunătăți performanța Konqueror
-Comment[ru]=Настройка параметров, которые могут повлиять на быстродействие KDE
-Comment[rw]=Kuboneza amagenamiterere ashobora kuvugurura imikorere ya KDE
-Comment[se]=Heivehusat mat buoridit KDE:a buvttu
-Comment[sk]=Nastavenie, ktoré môže vylepšiť výkon KDE
-Comment[sl]=Nastavite možnosti za pohitritev KDE
-Comment[sr]=Подешавање поставки које могу да побољшају перформансе KDE-а
-Comment[sr@Latn]=Podešavanje postavki koje mogu da poboljšaju performanse KDE-a
-Comment[sv]=Anpassa inställningar som kan förbättra KDE:s prestanda
-Comment[ta]=KDE செயல்திறனை அதிகப்படுத்தும் அமைப்புகளை அமை
-Comment[tg]= Танзимоте ки метавонанд амалкарди KDE-ро беҳбуд бахшанд, танзим кунед
-Comment[th]=ปรับแต่งตั้งค่าที่จะช่วยปรับประสิทธิภาพของ KDE
-Comment[tr]=KDE'nin performansını artıracak ayarlamaları yap
-Comment[tt]=KDE citezlegen arttıra ala torğan köyläwlär 
-Comment[uk]=Налаштування параметрів для покращання швидкодії KDE
-Comment[uz]=KDE unumdorligini oshirishi mumkin boʻlgan moslamalarni moslash
-Comment[uz@cyrillic]=KDE унумдорлигини ошириши мумкин бўлган мосламаларни мослаш
+Comment[ru]=Настройка параметров, которые могут повлиять на быстродействие TDE
+Comment[rw]=Kuboneza amagenamiterere ashobora kuvugurura imikorere ya TDE
+Comment[se]=Heivehusat mat buoridit TDE:a buvttu
+Comment[sk]=Nastavenie, ktoré môže vylepšiť výkon TDE
+Comment[sl]=Nastavite možnosti za pohitritev TDE
+Comment[sr]=Подешавање поставки које могу да побољшају перформансе TDE-а
+Comment[sr@Latn]=Podešavanje postavki koje mogu da poboljšaju performanse TDE-a
+Comment[sv]=Anpassa inställningar som kan förbättra TDE:s prestanda
+Comment[ta]=TDE செயல்திறனை அதிகப்படுத்தும் அமைப்புகளை அமை
+Comment[tg]= Танзимоте ки метавонанд амалкарди TDE-ро беҳбуд бахшанд, танзим кунед
+Comment[th]=ปรับแต่งตั้งค่าที่จะช่วยปรับประสิทธิภาพของ TDE
+Comment[tr]=TDE'nin performansını artıracak ayarlamaları yap
+Comment[tt]=TDE citezlegen arttıra ala torğan köyläwlär 
+Comment[uk]=Налаштування параметрів для покращання швидкодії TDE
+Comment[uz]=TDE unumdorligini oshirishi mumkin boʻlgan moslamalarni moslash
+Comment[uz@cyrillic]=TDE унумдорлигини ошириши мумкин бўлган мосламаларни мослаш
 Comment[vi]=Các thiết lập nâng cao khả năng của Konqueror
-Comment[wa]=Tchuzes d' apontiaedje ki plèt improuver KDE
-Comment[zh_CN]=配置提高 KDE 性能的设置
-Comment[zh_TW]=可增進 KDE 效能的設定
+Comment[wa]=Tchuzes d' apontiaedje ki plèt improuver TDE
+Comment[zh_CN]=配置提高 TDE 性能的设置
+Comment[zh_TW]=可增進 TDE 效能的設定
 
 Keywords=performance,speed,memory,improve
 Keywords[ar]=performance,speed,memory,improve,أداء,سرعة,ذاكرة,تحسين
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index d24f260eb..a21d23fe5 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -81,7 +81,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mMonitor = 0;
     mTesting = false;
 
-    // Add non-KDE path
+    // Add non-TDE path
     KGlobal::dirs()->addResourceType("scrsav",
                                      KGlobal::dirs()->kde_default("apps") +
                                      "apps/ScreenSavers/");
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index a7ed79b46..18bbbb5ed 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -43,7 +43,7 @@ KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, c
   layout->addStretch(1);
   connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() ));
 
-  setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the KDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.</p>"));
+  setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the TDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The TDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between TDE applications and non-TDE applications.</p>"));
 
 }
 
diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop
index 648853ea1..25e3362b7 100644
--- a/kcontrol/style/style.desktop
+++ b/kcontrol/style/style.desktop
@@ -90,145 +90,145 @@ Name[xh]=Uhlobo
 Name[zh_CN]=风格
 Name[zh_TW]=風格
 Name[zu]=Isitayela
-Comment=Allows the manipulation of widget behavior and changing the Style for KDE
-Comment[af]=Laat toe die manipulasie van gui-element gedrag en verandering die Styl vir Kde
-Comment[be]=Дазваляе кіраваць паводзінамі віджэтаў і змяняць стыль KDE
+Comment=Allows the manipulation of widget behavior and changing the Style for TDE
+Comment[af]=Laat toe die manipulasie van gui-element gedrag en verandering die Styl vir TDE
+Comment[be]=Дазваляе кіраваць паводзінамі віджэтаў і змяняць стыль TDE
 Comment[bg]=Настройване на стила
 Comment[bn]=উইজেট আচরণ নিয়ন্ত্রণ করুন এবং কে.ডি.ই-র স্টাইল পাল্টান
-Comment[bs]=Omogućuje upravljanje ponašanjem ukrasa i izmjenu stila za KDE
-Comment[ca]=Permet la manipulació del comportament dels estris i permet canviar-ne l'estil per al KDE
-Comment[cs]=Umožňuje upravit chování prvků grafického prostředí a změnu stylu KDE
-Comment[csb]=Zezwôlô na òpisanié zachòwaniô elementów interfejsu ë zmianã Sztélu KDE
-Comment[cy]=Yn caniatau trin ymddygiad teclyn a newid arddull KDE
-Comment[da]=Tillader manipulation af kontrolopførsel og ændring af stilen for KDE
+Comment[bs]=Omogućuje upravljanje ponašanjem ukrasa i izmjenu stila za TDE
+Comment[ca]=Permet la manipulació del comportament dels estris i permet canviar-ne l'estil per al TDE
+Comment[cs]=Umožňuje upravit chování prvků grafického prostředí a změnu stylu TDE
+Comment[csb]=Zezwôlô na òpisanié zachòwaniô elementów interfejsu ë zmianã Sztélu TDE
+Comment[cy]=Yn caniatau trin ymddygiad teclyn a newid arddull TDE
+Comment[da]=Tillader manipulation af kontrolopførsel og ændring af stilen for TDE
 Comment[de]=Stile und das Verhalten von Bedienelementen verändern
-Comment[el]=Επιτρέπει τη διαχείριση της συμπεριφοράς των γραφικών συστατικών και την αλλαγή του Στυλ για το KDE
-Comment[en_GB]=Allows the manipulation of widget behaviour and changing the Style for KDE
+Comment[el]=Επιτρέπει τη διαχείριση της συμπεριφοράς των γραφικών συστατικών και την αλλαγή του Στυλ για το TDE
+Comment[en_GB]=Allows the manipulation of widget behaviour and changing the Style for TDE
 Comment[eo]=Aspekto kaj konduto de la fenestroelementoj
-Comment[es]=Permite la manipulación del comportamiento del widget y permite cambiar el estilo para KDE
+Comment[es]=Permite la manipulación del comportamiento del widget y permite cambiar el estilo para TDE
 Comment[et]=Võimaldab muuta kasutajaliidese elementide käitumist ning välimust
 Comment[eu]=Widget-en portaera eta KDEren estiloa aldatzen uzten dizu
-Comment[fa]=اجازۀ دستکاری رفتار عنصر و تغییر سبک را برای KDE می‌دهد.
-Comment[fi]=Mahdollistaa kontrollien käyttäytymisen muokaamisen ja KDE:n tyylin vaihtamisen
-Comment[fr]=Permet la configuration du comportement des éléments graphiques et la modification des styles de KDE
-Comment[fy]=Hjirmei kinne jo it gedrach fan de widgets oanpasse en de styl fan KDE wizigje
-Comment[gl]=Permite a manipulación do comportamento dun widget e o cámbio de estilo de KDE
-Comment[he]=שינוי הגדרות פעולת הפריטים והסגנון של KDE
+Comment[fa]=اجازۀ دستکاری رفتار عنصر و تغییر سبک را برای TDE می‌دهد.
+Comment[fi]=Mahdollistaa kontrollien käyttäytymisen muokaamisen ja TDE:n tyylin vaihtamisen
+Comment[fr]=Permet la configuration du comportement des éléments graphiques et la modification des styles de TDE
+Comment[fy]=Hjirmei kinne jo it gedrach fan de widgets oanpasse en de styl fan TDE wizigje
+Comment[gl]=Permite a manipulación do comportamento dun widget e o cámbio de estilo de TDE
+Comment[he]=שינוי הגדרות פעולת הפריטים והסגנון של TDE
 Comment[hi]=केडीई की शैली तथा विजेट बर्ताव में परिवर्तन की स्वीकृति देता है
-Comment[hr]=Dopušta upravljanje ponašanja widgeta i izmjenu KDE stila
-Comment[hu]=Lehetővé teszi a grafikus alapelemek jellemzőinek megváltoztatását, a KDE stílusának módosítását
-Comment[is]=Leyfir hagræðingu á græjuhegðun og breytingu á KDE stílnum
-Comment[it]=Permette la configurazione del comportamento degli elementi grafici e il cambio dello stile di KDE
-Comment[ja]=ウィジェットの挙動と KDE のスタイルを変更
-Comment[ka]=KDE-ს ელემენტების სტილი და იერსახე
-Comment[kk]=KDE элементтерінің қасиеттері
-Comment[km]=អនុញ្ញាត​ឲ្យ​រៀបចំ​ឥរិយាបថ​វត្ថុ​មើលឃើញ និង​ប្ដូរ​រចនាប័ទ្ម​របស់ KDE
-Comment[ko]=KDE 위젯의 행동을 조정하고 스타일을 변경하기
-Comment[lt]=Leidžia manipuliuoti valdiklio elgsena ir leidžia pakeisti KDE stilių
-Comment[lv]=Atļauj manipulācijas ar logdaļu izturēšanos un ļauj mainīt Stilu priekš KDE
-Comment[mk]=Дозволува манипулација со однесувањата на графичките контроли и промена на стиловите во KDE
+Comment[hr]=Dopušta upravljanje ponašanja widgeta i izmjenu TDE stila
+Comment[hu]=Lehetővé teszi a grafikus alapelemek jellemzőinek megváltoztatását, a TDE stílusának módosítását
+Comment[is]=Leyfir hagræðingu á græjuhegðun og breytingu á TDE stílnum
+Comment[it]=Permette la configurazione del comportamento degli elementi grafici e il cambio dello stile di TDE
+Comment[ja]=ウィジェットの挙動と TDE のスタイルを変更
+Comment[ka]=TDE-ს ელემენტების სტილი და იერსახე
+Comment[kk]=TDE элементтерінің қасиеттері
+Comment[km]=អនុញ្ញាត​ឲ្យ​រៀបចំ​ឥរិយាបថ​វត្ថុ​មើលឃើញ និង​ប្ដូរ​រចនាប័ទ្ម​របស់ TDE
+Comment[ko]=TDE 위젯의 행동을 조정하고 스타일을 변경하기
+Comment[lt]=Leidžia manipuliuoti valdiklio elgsena ir leidžia pakeisti TDE stilių
+Comment[lv]=Atļauj manipulācijas ar logdaļu izturēšanos un ļauj mainīt Stilu priekš TDE
+Comment[mk]=Дозволува манипулација со однесувањата на графичките контроли и промена на стиловите во TDE
 Comment[mn]=Үйлчилгээний элементийн хэлбэр ба байдал өөрчилөх
-Comment[ms]=Membolehkan manipulasi kelakuan widget dan mengubah Gaya untuk KDE
-Comment[mt]=Hawn tista' timmanipula l-imġieba tal-kontrolli u tbiddel l-istil għall-KDE
-Comment[nb]=Her kan du endre oppførsel til skjermelementer, og endre stiler i KDE
-Comment[nds]=Hier kann dat Bedregen vun Bedeen-Elementen un ehr KDE-Stil ännert warrn
-Comment[ne]=KDE का लागि परिवर्तन शैली र विजेट व्यवहारको परिचालन गर्न अनुमति दिन्छ
-Comment[nl]=Hiermee kunt u het gedrag van de widgets aanpassen en de stijl van KDE wijzigen
-Comment[nn]=Let deg endra KDE-stilen og åtferda til skjermelementa
-Comment[nso]=Dumelela peakanyo ya mekgwa ya widget lego fetosa Mokgwa wa KDE
-Comment[pa]=KDE ਲਈ ਵਿਦਗਿਟ ਵਿਵਹਾਰ ਅਤੇ ਸ਼ੈਲੀ ਤਬਦੀਲ ਲਈ ਸਹਾਈ ਹੈ
-Comment[pl]=Pozwala na określenie zachowania elementów interfejsu i zmianę Stylu KDE
-Comment[pt]=Permite a manipulação do comportamento dos elementos gráficos e a mudança do estilo para o KDE
-Comment[pt_BR]=Permite a manipulação do comportamente de widgets e a escolha do estilo usado pelo KDE
-Comment[ro]=Modifică stilul grafic KDE și comportamentul elementelor grafice
-Comment[ru]=Стиль и облик элементов KDE
-Comment[rw]=Yemerera ikoreshwa ry'imyitwarire y'irenga no guhindura Imisusire ya KDE
-Comment[se]=Diktá du rievdadit KDE-stiilla ja šearbmaáđaid láhttema
-Comment[sk]=Umožňuje upraviť správanie prvkov a zmenu štýlu pre KDE
-Comment[sl]=Omogoča manipulacijo z gradniki in spreminjanje sloga KDE
-Comment[sr]=Омогућава подешавање понашања форми и промену стила за KDE
-Comment[sr@Latn]=Omogućava podešavanje ponašanja formi i promenu stila za KDE
-Comment[sv]=Tillåter manipulering av beteendet hos komponenter och ändring av stil på KDE
+Comment[ms]=Membolehkan manipulasi kelakuan widget dan mengubah Gaya untuk TDE
+Comment[mt]=Hawn tista' timmanipula l-imġieba tal-kontrolli u tbiddel l-istil għall-TDE
+Comment[nb]=Her kan du endre oppførsel til skjermelementer, og endre stiler i TDE
+Comment[nds]=Hier kann dat Bedregen vun Bedeen-Elementen un ehr TDE-Stil ännert warrn
+Comment[ne]=TDE का लागि परिवर्तन शैली र विजेट व्यवहारको परिचालन गर्न अनुमति दिन्छ
+Comment[nl]=Hiermee kunt u het gedrag van de widgets aanpassen en de stijl van TDE wijzigen
+Comment[nn]=Let deg endra TDE-stilen og åtferda til skjermelementa
+Comment[nso]=Dumelela peakanyo ya mekgwa ya widget lego fetosa Mokgwa wa TDE
+Comment[pa]=TDE ਲਈ ਵਿਦਗਿਟ ਵਿਵਹਾਰ ਅਤੇ ਸ਼ੈਲੀ ਤਬਦੀਲ ਲਈ ਸਹਾਈ ਹੈ
+Comment[pl]=Pozwala na określenie zachowania elementów interfejsu i zmianę Stylu TDE
+Comment[pt]=Permite a manipulação do comportamento dos elementos gráficos e a mudança do estilo para o TDE
+Comment[pt_BR]=Permite a manipulação do comportamente de widgets e a escolha do estilo usado pelo TDE
+Comment[ro]=Modifică stilul grafic TDE și comportamentul elementelor grafice
+Comment[ru]=Стиль и облик элементов TDE
+Comment[rw]=Yemerera ikoreshwa ry'imyitwarire y'irenga no guhindura Imisusire ya TDE
+Comment[se]=Diktá du rievdadit TDE-stiilla ja šearbmaáđaid láhttema
+Comment[sk]=Umožňuje upraviť správanie prvkov a zmenu štýlu pre TDE
+Comment[sl]=Omogoča manipulacijo z gradniki in spreminjanje sloga TDE
+Comment[sr]=Омогућава подешавање понашања форми и промену стила за TDE
+Comment[sr@Latn]=Omogućava podešavanje ponašanja formi i promenu stila za TDE
+Comment[sv]=Tillåter manipulering av beteendet hos komponenter och ändring av stil på TDE
 Comment[ta]=KDEக்கான வளைவுகளின் இயக்கத்தை கையாளவும் பாணிகளை மாற்றவும் அனுமதிக்கிறது
-Comment[tg]= Тавоноии таъғир ва ислоҳи навъи рафтори тарҳ ва услуби KDE-ро ба шумо медиҳад
-Comment[th]=อนุญาตการปรับรพฤติกรรมขอวิตเจ็ตลและเปลี่ยนลักษณะของ KDE
-Comment[tr]=KDE için Aletlerin davranışlarını ve stili değiştirmeyi sağlar
-Comment[tt]=KDE yözara berämleklärneñ çağılışı belän küreneşe 
-Comment[uk]=Керування поведінкою віджетів та зміна стилю KDE
-Comment[ven]=Tendela u tshinywa ha maitele a widget ni tendele nau shandukisa tshitaela tsha KDE
-Comment[vi]=Cho phép điều chỉnh ứng xử của các thành tố điều khiển và thay đổi kiểu dáng của KDE
-Comment[wa]=Permete d' eployî li dujhance des ahesses et d' candjî l' stîle po KDE
-Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha Uhlobo lwe KDE
-Comment[zh_CN]=允许操纵修饰行为和更改 KDE 的样式
-Comment[zh_TW]=讓您控制視窗元件 (widget) 的操作方式，以及更改 KDE 的風格
-Comment[zu]=Ivumela ukulawula kokuziphatha kwe-widget kanye nokushintsha isitayela se-KDE 
+Comment[tg]= Тавоноии таъғир ва ислоҳи навъи рафтори тарҳ ва услуби TDE-ро ба шумо медиҳад
+Comment[th]=อนุญาตการปรับรพฤติกรรมขอวิตเจ็ตลและเปลี่ยนลักษณะของ TDE
+Comment[tr]=TDE için Aletlerin davranışlarını ve stili değiştirmeyi sağlar
+Comment[tt]=TDE yözara berämleklärneñ çağılışı belän küreneşe 
+Comment[uk]=Керування поведінкою віджетів та зміна стилю TDE
+Comment[ven]=Tendela u tshinywa ha maitele a widget ni tendele nau shandukisa tshitaela tsha TDE
+Comment[vi]=Cho phép điều chỉnh ứng xử của các thành tố điều khiển và thay đổi kiểu dáng của TDE
+Comment[wa]=Permete d' eployî li dujhance des ahesses et d' candjî l' stîle po TDE
+Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha Uhlobo lwe TDE
+Comment[zh_CN]=允许操纵修饰行为和更改 TDE 的样式
+Comment[zh_TW]=讓您控制視窗元件 (widget) 的操作方式，以及更改 TDE 的風格
+Comment[zu]=Ivumela ukulawula kokuziphatha kwe-widget kanye nokushintsha isitayela se-TDE 
 
-Keywords=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications
-Keywords[af]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE programme
-Keywords[az]=tərz,tərzlər,görünüş,dekorlar,örtük,örtüklər,parçacıq,menyu,MacOS,menyu çubuğu,timsal,timsallar,vasitə çubuğu,mətn,düymə,siçan,şəffaf,hərəkət,ekran,proqram,proqramlar,KDE proqramları
-Keywords[be]=Стыль,Стылі,Выгляд,Вонкавы выгляд,Віджэт,Значкі,Панэлі начынняў,Тэкст,Падсвятленне,Праграмы,Праграмы KDE,style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications
-Keywords[bg]=стил, тема, външен, вид, икони, текст, цветове, style, styles, look, widget, icons, toolbars, text, highlight, apps, KDE applications
-Keywords[br]=giz,gizioù,widget,neuz,arlunoù,barrennoù an ostilhoù,skrid,highlight,meziantoù,meziantoù KDE
-Keywords[ca]=estil,estils,temes,aspecte,objete visual,estri,icones,barres d'eines,text,ressaltat,aplicacions,aplicacions KDE
-Keywords[cs]=Styl,Témata,Motivy,Vzhled,Text,Zvýraznění,Tlačítka,Aplikace KDE
-Keywords[csb]=sztél,sztéle,wëzdrzatk,òkno,ikònë,lëstwë nôrzãdzów,tekstë,nôdpisë,pòdskrzënienié,programë,programë KDE
-Keywords[cy]=arddull,arddulliau,golwg,teclyn,celfigyn,eiconau,bar offer,testun,amlygu,rhaglenni,rhaglenni  KDE
-Keywords[da]=stil,udseende,kontrol,ikoner,værktøjslinjer,tekst,fremhæv,prog,KDE-programmer
-Keywords[de]=Stile,Design,Themes,Schema,Elemente,Bildschirmelemente,Icons,Bedienelemente,Schriften,Symbole,Werkzeugleisten,Text,Hervorhebungen,Knöpfe,Anwendungen,Programme,KDE-Programme
-Keywords[el]=στυλ,στυλ,εμφάνιση,γραφικό συστατικό,εικονίδια,γραμμές εργαλείων,κείμενο,τονισμός,εφαρμογές,εφαρμογές KDE
+Keywords=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications
+Keywords[af]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE programme
+Keywords[az]=tərz,tərzlər,görünüş,dekorlar,örtük,örtüklər,parçacıq,menyu,MacOS,menyu çubuğu,timsal,timsallar,vasitə çubuğu,mətn,düymə,siçan,şəffaf,hərəkət,ekran,proqram,proqramlar,TDE proqramları
+Keywords[be]=Стыль,Стылі,Выгляд,Вонкавы выгляд,Віджэт,Значкі,Панэлі начынняў,Тэкст,Падсвятленне,Праграмы,Праграмы TDE,style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications
+Keywords[bg]=стил, тема, външен, вид, икони, текст, цветове, style, styles, look, widget, icons, toolbars, text, highlight, apps, TDE applications
+Keywords[br]=giz,gizioù,widget,neuz,arlunoù,barrennoù an ostilhoù,skrid,highlight,meziantoù,meziantoù TDE
+Keywords[ca]=estil,estils,temes,aspecte,objete visual,estri,icones,barres d'eines,text,ressaltat,aplicacions,aplicacions TDE
+Keywords[cs]=Styl,Témata,Motivy,Vzhled,Text,Zvýraznění,Tlačítka,Aplikace TDE
+Keywords[csb]=sztél,sztéle,wëzdrzatk,òkno,ikònë,lëstwë nôrzãdzów,tekstë,nôdpisë,pòdskrzënienié,programë,programë TDE
+Keywords[cy]=arddull,arddulliau,golwg,teclyn,celfigyn,eiconau,bar offer,testun,amlygu,rhaglenni,rhaglenni  TDE
+Keywords[da]=stil,udseende,kontrol,ikoner,værktøjslinjer,tekst,fremhæv,prog,TDE-programmer
+Keywords[de]=Stile,Design,Themes,Schema,Elemente,Bildschirmelemente,Icons,Bedienelemente,Schriften,Symbole,Werkzeugleisten,Text,Hervorhebungen,Knöpfe,Anwendungen,Programme,TDE-Programme
+Keywords[el]=στυλ,στυλ,εμφάνιση,γραφικό συστατικό,εικονίδια,γραμμές εργαλείων,κείμενο,τονισμός,εφαρμογές,εφαρμογές TDE
 Keywords[eo]=stilo,aspekto,fenestraĵo,piktogramo,ilobreto,aplikaĵoj
-Keywords[es]=estilo,estilos,temas,aspecto,objeto visual,widget,texto,resaltado,botones, aplicaciones, aplicaciones KDE
-Keywords[et]=stiil,stiilid,teemad,välimus,elemendid,vidinad,menüüriba,ikoonid, tööriistaribad,rakendused,KDE rakendused
-Keywords[eu]=estiloa,estiloak,itxura,widget-a,ikonoak,tresna-barrak,testua, nabarmenketa,aplikazioak,KDE aplikazioak
-Keywords[fa]=سبک، سبکها، ظاهر، عنصر، شمایلها، میله‌ ابزارها، متن، مشخص، کاربردها، کاربردهای KDE
-Keywords[fi]=tyyli,tyylit,ulkonäkö,kontrolli,kuvakkeet,työkalurivit,teksti,korostus,sovellukset,KDE sovellukset
-Keywords[fr]=style,styles,thème,apparence,widget,élément graphique,barre demenus,MacOS,police,couleur,non KDE,icône,icônes,barre d'outils,barres d'outils,barres de menus,texte,surbrillance,sélection,bouton,souris,transparence,déplacement,écran,applications,programmes,programmes non KDE,applications non KDE
-Keywords[fy]=styl,stylen,look,üterlik,widget,icons,ikoan,ikoanen,wurkbalke,tekst,highlight,pljochtsje,apps,KDE-tapassingen,programma's,KDE-programma's,tapassingen
-Keywords[ga]=stíl,stíleanna,téama,cuma,giuirléid,deilbhíní,barraí uirlisí,téacs,aibhsiú,feidhmchláir,feidhmchláir KDE
-Keywords[gl]=estilo,estilos,apariencia,widget,iconas,barras de ferramentas,texto,resaltar,aplicacións,aplicacións KDE
-Keywords[he]=סגנון,מראה,פריטים,סמלים,סרגל כלים,טקסט,הדגשה,יישומים,יישומים של KDE,style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications
+Keywords[es]=estilo,estilos,temas,aspecto,objeto visual,widget,texto,resaltado,botones, aplicaciones, aplicaciones TDE
+Keywords[et]=stiil,stiilid,teemad,välimus,elemendid,vidinad,menüüriba,ikoonid, tööriistaribad,rakendused,TDE rakendused
+Keywords[eu]=estiloa,estiloak,itxura,widget-a,ikonoak,tresna-barrak,testua, nabarmenketa,aplikazioak,TDE aplikazioak
+Keywords[fa]=سبک، سبکها، ظاهر، عنصر، شمایلها، میله‌ ابزارها، متن، مشخص، کاربردها، کاربردهای TDE
+Keywords[fi]=tyyli,tyylit,ulkonäkö,kontrolli,kuvakkeet,työkalurivit,teksti,korostus,sovellukset,TDE sovellukset
+Keywords[fr]=style,styles,thème,apparence,widget,élément graphique,barre demenus,MacOS,police,couleur,non TDE,icône,icônes,barre d'outils,barres d'outils,barres de menus,texte,surbrillance,sélection,bouton,souris,transparence,déplacement,écran,applications,programmes,programmes non TDE,applications non TDE
+Keywords[fy]=styl,stylen,look,üterlik,widget,icons,ikoan,ikoanen,wurkbalke,tekst,highlight,pljochtsje,apps,TDE-tapassingen,programma's,TDE-programma's,tapassingen
+Keywords[ga]=stíl,stíleanna,téama,cuma,giuirléid,deilbhíní,barraí uirlisí,téacs,aibhsiú,feidhmchláir,feidhmchláir TDE
+Keywords[gl]=estilo,estilos,apariencia,widget,iconas,barras de ferramentas,texto,resaltar,aplicacións,aplicacións TDE
+Keywords[he]=סגנון,מראה,פריטים,סמלים,סרגל כלים,טקסט,הדגשה,יישומים,יישומים של TDE,style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications
 Keywords[hi]=शैली,शैलियाँ,रूप,विजेट,प्रतीक,औज़ार-पट्टी,पाठ,उभारें,एप्प्स,केडीई अनुप्रयोग
-Keywords[hr]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,stil,izgled,ikone,alatne trake,tekst,naglašavanje,KDE aplikacije
-Keywords[hu]=stílus,stílusok,kinézet,grafikus elem,ikonok,eszköztárak,szöveg,kiemelés,alkalmazások,KDE alkalmazások
+Keywords[hr]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,stil,izgled,ikone,alatne trake,tekst,naglašavanje,TDE aplikacije
+Keywords[hu]=stílus,stílusok,kinézet,grafikus elem,ikonok,eszköztárak,szöveg,kiemelés,alkalmazások,TDE alkalmazások
 Keywords[is]=stíll,stílar,þemur,þema,útlit,valmyndir,valslá,MacOS,letur,leturgerðir,leturgerð,gegnsætt,skjár,forrit, táknmyndir,takkar,mús,takki,hnappur
-Keywords[it]=stile,stili,aspetto,widget,elemento grafico,icone,barre degli strumenti,testo,evidenziazione,applicazioni,applicazioni KDE
+Keywords[it]=stile,stili,aspetto,widget,elemento grafico,icone,barre degli strumenti,testo,evidenziazione,applicazioni,applicazioni TDE
 Keywords[ja]=スタイル,スタイル,外観,ウィジェット,アイコン,ツールバー,テキスト,ハイライト,アプリ,KDEアプリケーション
-Keywords[km]=រចនាប័ទ្ម,រូបរាង,វត្ថុ​មើលឃើញ,រូបតំណាង,របារ​ឧបករណ៍,អត្ថបទ,បន្លិច,កម្មវិធី,កម្មវិធី KDE
-Keywords[lt]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications, stilius,stiliai,išvaizda,valdiklis,ženkliukai,piktogramos,įrankių juostos,paryškinimas,KDE taikomosios programos
-Keywords[mk]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,стил,стилови,изглед,икони,алатници,текст,KDE апликации
+Keywords[km]=រចនាប័ទ្ម,រូបរាង,វត្ថុ​មើលឃើញ,រូបតំណាង,របារ​ឧបករណ៍,អត្ថបទ,បន្លិច,កម្មវិធី,កម្មវិធី TDE
+Keywords[lt]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications, stilius,stiliai,išvaizda,valdiklis,ženkliukai,piktogramos,įrankių juostos,paryškinimas,TDE taikomosios programos
+Keywords[mk]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,стил,стилови,изглед,икони,алатници,текст,TDE апликации
 Keywords[mn]=Хэлбэр,Загвар,Themes,Схем,Элемент,Дэлгэцийн элемент,Icons, Үйлчилгээний элемент,Бичиг,Тэмдэг,Багаж самбар,Текст,Онцгойлолт,Товч, Хэрэглээний,Програм,КДЭ-Програм
-Keywords[mt]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,stili,dehra,ikoni,test,immarkar
-Keywords[nb]=stil,stiler,temaer,utseende,menylinje,skrifttype,farger,ikke-KDE,ikoner,verktøylinje,tekst,knapper,mus,flytting,skjerm,programmer,ikke-KDE programmer
-Keywords[nds]=Stil,Stilen,look,widget,Lüttbiller,Warktüüchbalken,Text,markeren,Programmen,KDE-Programmen,Bedeenelement
-Keywords[ne]=शैली, शैलीहरू, हेर्नुहोस्, विजेट, प्रतिमा, उपकरणपट्टी, पाठ, हाइलाइट,apps,KDE अनुप्रयोगहरू
-Keywords[nl]=stijl,stijlen,look,uiterlijk,widget,icons,iconen,pictogrammen,werkbalken,tekst,highlight,accentuatie,apps,KDE-toepassingen,programma's,KDE-programma's,toepassingen
-Keywords[nn]=stil,tema,utsjånad,bunad,element,skjermelement,verktøylinje,tekst,markering,program,KDE-program
-Keywords[nso]=mokgwa,mekgwa,tebelelo,widget,diemedi,di-bar tsa dibereka,sengwalwana,pontshwana,apps,KDE ditshomiso
-Keywords[pa]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,ਸ਼ੈਲੀ,ਸ਼ੈਲੀਆਂ,ਦਿੱਖ,ਆਈਕਾਨ,ਸੰਦ-ਪੱਟੀ,ਪਾਠ,ਉਘਾੜੋ,ਕਾਰਜ
-Keywords[pl]=styl,style,wygląd,okienko,ikony,paski narzędzi,tekst,napisy,podświetlenie,programy,programy KDE
-Keywords[pt]=estilo,estilos,aparência,elemento,ícones,ferramentas,texto,realce,aplicações,aplicações do KDE
-Keywords[pt_BR]=estilo,estilos,aparência,widget,ícones,barra de ferramentas,texto,realce,aplicativos,aplicativos não-KDE
-Keywords[ro]=stil,aspect,componentă,widget,iconițe,bare de unelte,text,evidențiere,aplicații,KDE
-Keywords[ru]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,стиль,стили,приложения
-Keywords[rw]=umususire,imisusire,imboneko,irenga,udushushondanga,umwanyabikoresho,umwandiko,gushimangira,porogaramu,Porogaramu KDE  
-Keywords[se]=stiila,fáddá,fárda,áđat,govažat,neavvoholggat,teaksta,merken,prográmmat,KDE-prográmmat
-Keywords[sk]=štýl,štýly,vzhľad,prvok,ikony,KDE aplikácie,panely nástrojov,text,zvýraznenie,aplikácie
+Keywords[mt]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,stili,dehra,ikoni,test,immarkar
+Keywords[nb]=stil,stiler,temaer,utseende,menylinje,skrifttype,farger,ikke-TDE,ikoner,verktøylinje,tekst,knapper,mus,flytting,skjerm,programmer,ikke-TDE programmer
+Keywords[nds]=Stil,Stilen,look,widget,Lüttbiller,Warktüüchbalken,Text,markeren,Programmen,TDE-Programmen,Bedeenelement
+Keywords[ne]=शैली, शैलीहरू, हेर्नुहोस्, विजेट, प्रतिमा, उपकरणपट्टी, पाठ, हाइलाइट,apps,TDE अनुप्रयोगहरू
+Keywords[nl]=stijl,stijlen,look,uiterlijk,widget,icons,iconen,pictogrammen,werkbalken,tekst,highlight,accentuatie,apps,TDE-toepassingen,programma's,TDE-programma's,toepassingen
+Keywords[nn]=stil,tema,utsjånad,bunad,element,skjermelement,verktøylinje,tekst,markering,program,TDE-program
+Keywords[nso]=mokgwa,mekgwa,tebelelo,widget,diemedi,di-bar tsa dibereka,sengwalwana,pontshwana,apps,TDE ditshomiso
+Keywords[pa]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,ਸ਼ੈਲੀ,ਸ਼ੈਲੀਆਂ,ਦਿੱਖ,ਆਈਕਾਨ,ਸੰਦ-ਪੱਟੀ,ਪਾਠ,ਉਘਾੜੋ,ਕਾਰਜ
+Keywords[pl]=styl,style,wygląd,okienko,ikony,paski narzędzi,tekst,napisy,podświetlenie,programy,programy TDE
+Keywords[pt]=estilo,estilos,aparência,elemento,ícones,ferramentas,texto,realce,aplicações,aplicações do TDE
+Keywords[pt_BR]=estilo,estilos,aparência,widget,ícones,barra de ferramentas,texto,realce,aplicativos,aplicativos não-TDE
+Keywords[ro]=stil,aspect,componentă,widget,iconițe,bare de unelte,text,evidențiere,aplicații,TDE
+Keywords[ru]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,стиль,стили,приложения
+Keywords[rw]=umususire,imisusire,imboneko,irenga,udushushondanga,umwanyabikoresho,umwandiko,gushimangira,porogaramu,Porogaramu TDE  
+Keywords[se]=stiila,fáddá,fárda,áđat,govažat,neavvoholggat,teaksta,merken,prográmmat,TDE-prográmmat
+Keywords[sk]=štýl,štýly,vzhľad,prvok,ikony,TDE aplikácie,panely nástrojov,text,zvýraznenie,aplikácie
 Keywords[sl]=slog,slogi,stil,stili,teme,videz,izgled,gradnik,menujska vrstica,osvetlitev,programi,programi za KDEi
-Keywords[sr]=style,styles,look,widget,icons,toolbars,text,highlight,apps,стил,стилови,теме,изглед,форма,иконе,траке са алатима,текст,истицање,програми,KDE програми
-Keywords[sr@Latn]=style,styles,look,widget,icons,toolbars,text,highlight,apps,stil,stilovi,teme,izgled,forma,ikone,trake sa alatima,tekst,isticanje,programi,KDE programi
-Keywords[sv]=stil,stilar,utseende,komponent,ikoner,verktygrader,text,färgläggning, program,KDE-program
+Keywords[sr]=style,styles,look,widget,icons,toolbars,text,highlight,apps,стил,стилови,теме,изглед,форма,иконе,траке са алатима,текст,истицање,програми,TDE програми
+Keywords[sr@Latn]=style,styles,look,widget,icons,toolbars,text,highlight,apps,stil,stilovi,teme,izgled,forma,ikone,trake sa alatima,tekst,isticanje,programi,TDE programi
+Keywords[sv]=stil,stilar,utseende,komponent,ikoner,verktygrader,text,färgläggning, program,TDE-program
 Keywords[ta]=பாணி,பாணிகள்,பார்,வளைவு,சின்னம்,கருவிப்பட்டி,உரை,தனிப்படுத்து,பயன்பாடு,கேடியி பயன்பாடுகள்
-Keywords[th]=ลักษณะ,ที่มองเห็น,วิตเจ็ต,ไอคอน,แถบเครื่องมือ,ข้อความ,ทำตัวเน้น,โปรแกรม,แอพพลิเคชัน KDE
-Keywords[tr]=simgeler,stil,stiller,dekor,dekorlar,tema,temalar,görünüm,parçacık,menü,KDE uygulamaları,araç çubukları,uygulamalar
-Keywords[uk]=стиль,стилі,вигляд,віджет,піктограми,пенали, текст,виділення,програми KDE
-Keywords[uz]=uslub,uslublar,tashqi koʻrinishi,vidjet,nishonchalar,asboblar paneli,matn,belgilash,dasturlar,KDE dasturlari
-Keywords[uz@cyrillic]=услуб,услублар,ташқи кўриниши,виджет,нишончалар,асбоблар панели,матн,белгилаш,дастурлар,KDE дастурлари
-Keywords[ven]=Tshitaela,Zwitaela,sedza,widget,dziaikhono,bara ya tshishumiswa,manwalwa,bvisela khagala,apps,dziapulifikhesheni ya KDE
-Keywords[vi]=kiểu,các kiểu,nhìn,widget,biểu tượng,thanh công cụ,text,đánh dấu,apps,ứng dụng KDE
-Keywords[wa]=stîle,stîles,rivnance,ahesse,imådjete,Bårs ås usteyes,tecse,programes,programes KDE
-Keywords[xh]=uhlobo, iintlobo, jonga, widget, amaphawu emifanekiso, iibar zesixhobo, umbhalo, phawula, apps, izicelo ze KDE
-Keywords[zh_CN]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,风格,外观,窗口部件,图标,工具栏,文字,突出,KDE 程序,KDE 应用程序
-Keywords[zh_TW]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,風格,主題,外觀,視窗元件,圖示,工具列,文字,突出顯示,應用程式,KDE 應用程式
-Keywords[zu]=isitayela,izitayela,ukubukeka,widget,izimpawu zezithombe,amabha amathuluzi,umbhalo,ukugqamisa,apps,abayaleli be-KDE
+Keywords[th]=ลักษณะ,ที่มองเห็น,วิตเจ็ต,ไอคอน,แถบเครื่องมือ,ข้อความ,ทำตัวเน้น,โปรแกรม,แอพพลิเคชัน TDE
+Keywords[tr]=simgeler,stil,stiller,dekor,dekorlar,tema,temalar,görünüm,parçacık,menü,TDE uygulamaları,araç çubukları,uygulamalar
+Keywords[uk]=стиль,стилі,вигляд,віджет,піктограми,пенали, текст,виділення,програми TDE
+Keywords[uz]=uslub,uslublar,tashqi koʻrinishi,vidjet,nishonchalar,asboblar paneli,matn,belgilash,dasturlar,TDE dasturlari
+Keywords[uz@cyrillic]=услуб,услублар,ташқи кўриниши,виджет,нишончалар,асбоблар панели,матн,белгилаш,дастурлар,TDE дастурлари
+Keywords[ven]=Tshitaela,Zwitaela,sedza,widget,dziaikhono,bara ya tshishumiswa,manwalwa,bvisela khagala,apps,dziapulifikhesheni ya TDE
+Keywords[vi]=kiểu,các kiểu,nhìn,widget,biểu tượng,thanh công cụ,text,đánh dấu,apps,ứng dụng TDE
+Keywords[wa]=stîle,stîles,rivnance,ahesse,imådjete,Bårs ås usteyes,tecse,programes,programes TDE
+Keywords[xh]=uhlobo, iintlobo, jonga, widget, amaphawu emifanekiso, iibar zesixhobo, umbhalo, phawula, apps, izicelo ze TDE
+Keywords[zh_CN]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,风格,外观,窗口部件,图标,工具栏,文字,突出,TDE 程序,TDE 应用程序
+Keywords[zh_TW]=style,styles,look,widget,icons,toolbars,text,highlight,apps,TDE applications,風格,主題,外觀,視窗元件,圖示,工具列,文字,突出顯示,應用程式,TDE 應用程式
+Keywords[zu]=isitayela,izitayela,ukubukeka,widget,izimpawu zezithombe,amabha amathuluzi,umbhalo,ukugqamisa,apps,abayaleli be-TDE
 
 Categories=Qt;KDE;X-KDE-settings-looknfeel;
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index ad075ba22..dc8d4d330 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -231,7 +231,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
     XSelectInput( tqt_xdisplay(), tqt_xrootwin(),
         SubstructureNotifyMask | rootAttr.your_event_mask );
 
-    // Add non-KDE path
+    // Add non-TDE path
     KGlobal::dirs()->addResourceType("scrsav",
                                     KGlobal::dirs()->kde_default("apps") +
                                     "System/ScreenSavers/");
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index e15596ffb..9a4c52f3c 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -101,7 +101,7 @@ static void signalHandler(int sigId)
 void KDesktop::slotUpAndRunning()
 {
     // Activate crash recovery
-    if (getenv("KDE_DEBUG") == NULL)
+    if (getenv("TDE_DEBUG") == NULL)
         KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
 }
 
diff --git a/khelpcenter/plugins/faq.desktop b/khelpcenter/plugins/faq.desktop
index 8650262c9..5d453d373 100644
--- a/khelpcenter/plugins/faq.desktop
+++ b/khelpcenter/plugins/faq.desktop
@@ -1,80 +1,80 @@
 [Desktop Entry]
 DocPath=help:/khelpcenter/faq/index.html
 
-Name=The KDE FAQ
-Name[af]=Die Kde Faq
-Name[ar]=أسئلة KDE المتكررة
-Name[be]=FAQ KDE
+Name=The TDE FAQ
+Name[af]=Die TDE Faq
+Name[ar]=أسئلة TDE المتكررة
+Name[be]=FAQ TDE
 Name[bg]=Често задавани въпроси
 Name[bn]=কে.ডি.ই. FAQ
-Name[bs]=KDE FAQ
-Name[ca]=La PMF del KDE
-Name[cs]=Často kladené dotazy KDE
-Name[csb]=KDE FAQ
-Name[cy]=Y FAQ KDE
-Name[da]=KDE OSS
-Name[de]=Häufig gestellte Fragen zu KDE (FAQ)
-Name[el]=Το KDE FAQ
-Name[eo]=La KDE-Oftaj Demandoj
-Name[es]=Las PF de KDE
-Name[et]=KDE korduma kippuvad küsimused
-Name[eu]=KDE FAQa (maiz egiten diren galderak)
-Name[fa]=پرسشهای متداول KDE
-Name[fi]=KDE FAQ
-Name[fr]=La FAQ (questions fréquentes) de KDE
-Name[fy]=Protte foarkommende fragen oer KDE
-Name[ga]=Ceisteanna Coitianta KDE
-Name[gl]=A FAQ de KDE
-Name[he]=שאלות נפוצות על KDE
+Name[bs]=TDE FAQ
+Name[ca]=La PMF del TDE
+Name[cs]=Často kladené dotazy TDE
+Name[csb]=TDE FAQ
+Name[cy]=Y FAQ TDE
+Name[da]=TDE OSS
+Name[de]=Häufig gestellte Fragen zu TDE (FAQ)
+Name[el]=Το TDE FAQ
+Name[eo]=La TDE-Oftaj Demandoj
+Name[es]=Las PF de TDE
+Name[et]=TDE korduma kippuvad küsimused
+Name[eu]=TDE FAQa (maiz egiten diren galderak)
+Name[fa]=پرسشهای متداول TDE
+Name[fi]=TDE FAQ
+Name[fr]=La FAQ (questions fréquentes) de TDE
+Name[fy]=Protte foarkommende fragen oer TDE
+Name[ga]=Ceisteanna Coitianta TDE
+Name[gl]=A FAQ de TDE
+Name[he]=שאלות נפוצות על TDE
 Name[hi]=केडीई एफ़एक्यू
-Name[hr]=KDE FAQ
-Name[hu]=KDE FAQ
-Name[is]=KDE Spurt og Svarað (SoS)
-Name[it]=Domande su KDE (FAQ)
-Name[ja]=KDE FAQ
-Name[ka]=KDE: ძირითადი კითხვები
-Name[kk]=KDE сұрақ пен жауаптар
-Name[km]=សំណួរ​ដែល​សួរ​ដដែលៗ​អំពី KDE
-Name[ko]=KDE 자주 묻는 질문
-Name[lt]=KDE D.U.K.(FAQ)
-Name[lv]=KDE BUJ
-Name[mk]=KDE ЧПП
+Name[hr]=TDE FAQ
+Name[hu]=TDE FAQ
+Name[is]=TDE Spurt og Svarað (SoS)
+Name[it]=Domande su TDE (FAQ)
+Name[ja]=TDE FAQ
+Name[ka]=TDE: ძირითადი კითხვები
+Name[kk]=TDE сұрақ пен жауаптар
+Name[km]=សំណួរ​ដែល​សួរ​ដដែលៗ​អំពី TDE
+Name[ko]=TDE 자주 묻는 질문
+Name[lt]=TDE D.U.K.(FAQ)
+Name[lv]=TDE BUJ
+Name[mk]=TDE ЧПП
 Name[mn]=КДЭ-с ихэвчилэн асуугддаг асуултууд (FAQ)
-Name[ms]=FAQ KDE
-Name[mt]=Mistoqsijiet komuni tal-KDE
-Name[nb]=Ofte stilte KDE-spørsmål
-Name[nds]=Dat KDE-FAQ
-Name[ne]=KDE FAQ
-Name[nl]=Veel voorkomde vragen over KDE
-Name[nn]=Ofte stilte KDE-spørsmål
-Name[nso]=FAQ ya KDE
-Name[pa]=KDE ਸਵਾਲ-ਜਵਾਬ
-Name[pl]=Często Zadawane Pytania KDE
-Name[pt]=A FAQ do KDE
-Name[pt_BR]=O FAQ do KDE
+Name[ms]=FAQ TDE
+Name[mt]=Mistoqsijiet komuni tal-TDE
+Name[nb]=Ofte stilte TDE-spørsmål
+Name[nds]=Dat TDE-FAQ
+Name[ne]=TDE FAQ
+Name[nl]=Veel voorkomde vragen over TDE
+Name[nn]=Ofte stilte TDE-spørsmål
+Name[nso]=FAQ ya TDE
+Name[pa]=TDE ਸਵਾਲ-ਜਵਾਬ
+Name[pl]=Często Zadawane Pytania TDE
+Name[pt]=A FAQ do TDE
+Name[pt_BR]=O FAQ do TDE
 Name[ro]=Răspunsuri la întrebări frecvente
-Name[ru]=KDE: вопросы и ответы
-Name[rw]=Ibibazo Bibazwa Cyane bya KDE
-Name[se]=Dávjá jearahuvvon KDE-gažaldagat (KDE-DJG)
-Name[sk]=KDE FAQ
-Name[sl]=Vprašanja in odgovori o KDE
-Name[sr]=Често постављана питања о KDE-у
-Name[sr@Latn]=Često postavljana pitanja o KDE-u
-Name[sv]=Vanliga frågor om KDE
-Name[ta]=KDE FAQ(அடிக்கடி கேட்கப்படும் கேள்விகள்)
+Name[ru]=TDE: вопросы и ответы
+Name[rw]=Ibibazo Bibazwa Cyane bya TDE
+Name[se]=Dávjá jearahuvvon TDE-gažaldagat (TDE-DJG)
+Name[sk]=TDE FAQ
+Name[sl]=Vprašanja in odgovori o TDE
+Name[sr]=Често постављана питања о TDE-у
+Name[sr@Latn]=Često postavljana pitanja o TDE-u
+Name[sv]=Vanliga frågor om TDE
+Name[ta]=TDE FAQ(அடிக்கடி கேட்கப்படும் கேள்விகள்)
 Name[te]=కెడిఈ ఎఫ్ ఏ క్యు
-Name[tg]=KDE: саволҳо ва ҷавобҳо
-Name[th]=คำถามที่ถามบ่อยของ KDE
-Name[tr]=KDE SSS
-Name[tt]=KDE YBSı
-Name[uk]=ЧАП для KDE
-Name[uz]=KDE TSS
-Name[uz@cyrillic]=KDE ТСС
-Name[vi]=Các câu hỏi hay gặp của KDE
-Name[wa]=Li dicåce ås kesses (FAQ) KDE
-Name[xh]=KDE FAQ
-Name[zh_CN]=KDE FAQ
-Name[zh_TW]=KDE 常見問題
-Name[zu]=I-FAQ ye-KDE
+Name[tg]=TDE: саволҳо ва ҷавобҳо
+Name[th]=คำถามที่ถามบ่อยของ TDE
+Name[tr]=TDE SSS
+Name[tt]=TDE YBSı
+Name[uk]=ЧАП для TDE
+Name[uz]=TDE TSS
+Name[uz@cyrillic]=TDE ТСС
+Name[vi]=Các câu hỏi hay gặp của TDE
+Name[wa]=Li dicåce ås kesses (FAQ) TDE
+Name[xh]=TDE FAQ
+Name[zh_CN]=TDE FAQ
+Name[zh_TW]=TDE 常見問題
+Name[zu]=I-FAQ ye-TDE
 
 X-DOC-Weight=2000
diff --git a/khelpcenter/plugins/links.desktop b/khelpcenter/plugins/links.desktop
index b0516802d..43c770cc1 100644
--- a/khelpcenter/plugins/links.desktop
+++ b/khelpcenter/plugins/links.desktop
@@ -1,77 +1,77 @@
 [Desktop Entry]
 DocPath=help:/khelpcenter/index.html?anchor=links
 
-Name=KDE on the Web
-Name[af]=KDE op die Web
-Name[ar]=KDE على الشبكة
-Name[be]=KDE у Сеціве
-Name[bg]=KDE в Интернет
+Name=TDE on the Web
+Name[af]=TDE op die Web
+Name[ar]=TDE على الشبكة
+Name[be]=TDE у Сеціве
+Name[bg]=TDE в Интернет
 Name[bn]=ওয়েব-এ কে.ডি.ই.
-Name[br]=KDE war ar Gwiad
-Name[bs]=KDE na webu
-Name[ca]=KDE a la web
-Name[cs]=KDE na webu
-Name[csb]=KDE w sécë
-Name[cy]=KDE ar y We
-Name[da]=KDE på nettet
-Name[de]=KDE im Web
-Name[el]=Το KDE στο διαδίκτυο
-Name[eo]=KDE en TTT
-Name[es]=KDE en la web
-Name[et]=KDE veebis
-Name[eu]=KDE Web-ean
-Name[fa]=KDE روی وب
-Name[fi]=KDE webissä
-Name[fr]=KDE sur le web
-Name[fy]=KDE op it ynternet
-Name[ga]=KDE ar an Ghréasán
-Name[gl]=KDE na web
-Name[he]=KDE באינטרנט
+Name[br]=TDE war ar Gwiad
+Name[bs]=TDE na webu
+Name[ca]=TDE a la web
+Name[cs]=TDE na webu
+Name[csb]=TDE w sécë
+Name[cy]=TDE ar y We
+Name[da]=TDE på nettet
+Name[de]=TDE im Web
+Name[el]=Το TDE στο διαδίκτυο
+Name[eo]=TDE en TTT
+Name[es]=TDE en la web
+Name[et]=TDE veebis
+Name[eu]=TDE Web-ean
+Name[fa]=TDE روی وب
+Name[fi]=TDE webissä
+Name[fr]=TDE sur le web
+Name[fy]=TDE op it ynternet
+Name[ga]=TDE ar an Ghréasán
+Name[gl]=TDE na web
+Name[he]=TDE באינטרנט
 Name[hi]=केडीई वेब पर
-Name[hr]=KDE na Internetu
-Name[hu]=A KDE az interneten
-Name[is]=KDE á vefnum
-Name[it]=KDE su internet
-Name[ja]=ウェブ上の KDE
-Name[ka]=KDE ინტერნეტში
-Name[kk]=KDE Интернетте
-Name[km]=KDE លើ​បណ្ដាញ
-Name[ko]=웹에서의 KDE
-Name[lt]=KDE žiniatinklyje
-Name[lv]=KDE tīklā
-Name[mk]=KDE на мрежа
-Name[ms]=KDE dalam Web
-Name[mt]=KDE fuq il-Web
-Name[nb]=KDE på nettet
-Name[nds]=KDE in't Nett
+Name[hr]=TDE na Internetu
+Name[hu]=A TDE az interneten
+Name[is]=TDE á vefnum
+Name[it]=TDE su internet
+Name[ja]=ウェブ上の TDE
+Name[ka]=TDE ინტერნეტში
+Name[kk]=TDE Интернетте
+Name[km]=TDE លើ​បណ្ដាញ
+Name[ko]=웹에서의 TDE
+Name[lt]=TDE žiniatinklyje
+Name[lv]=TDE tīklā
+Name[mk]=TDE на мрежа
+Name[ms]=TDE dalam Web
+Name[mt]=TDE fuq il-Web
+Name[nb]=TDE på nettet
+Name[nds]=TDE in't Nett
 Name[ne]=वेबमा केडीई
-Name[nl]=KDE op het internet
-Name[nn]=KDE på verdsveven
-Name[pa]=ਵੈੱਬ 'ਤੇ KDE
-Name[pl]=KDE w sieci
-Name[pt]=O KDE na Web
-Name[pt_BR]=KDE na Web
-Name[ro]=KDE pe Internet
-Name[ru]=KDE в Интернете
-Name[rw]=KDE ku Rubugamakuru
-Name[se]=KDE interneahtas
-Name[sk]=KDE na WWW
-Name[sl]=KDE na spletu
-Name[sr]=KDE на вебу
-Name[sr@Latn]=KDE na vebu
-Name[sv]=KDE på Internet
+Name[nl]=TDE op het internet
+Name[nn]=TDE på verdsveven
+Name[pa]=ਵੈੱਬ 'ਤੇ TDE
+Name[pl]=TDE w sieci
+Name[pt]=O TDE na Web
+Name[pt_BR]=TDE na Web
+Name[ro]=TDE pe Internet
+Name[ru]=TDE в Интернете
+Name[rw]=TDE ku Rubugamakuru
+Name[se]=TDE interneahtas
+Name[sk]=TDE na WWW
+Name[sl]=TDE na spletu
+Name[sr]=TDE на вебу
+Name[sr@Latn]=TDE na vebu
+Name[sv]=TDE på Internet
 Name[ta]=வலையத்தில் கேடியி
 Name[te]=వెబ్ లొ కెడిఈ
-Name[tg]=KDE дар Интернет
-Name[th]=KDE บนเว็บ
-Name[tr]=Web'de KDE
-Name[tt]=KDE Päräwezdä
-Name[uk]=KDE в Тенетах
-Name[uz]=KDE veb-sahifalari
-Name[uz@cyrillic]=KDE веб-саҳифалари
-Name[vi]=KDE trên mạng
-Name[wa]=KDE sol waibe
-Name[zh_CN]=网上 KDE
-Name[zh_TW]=KDE 網站
+Name[tg]=TDE дар Интернет
+Name[th]=TDE บนเว็บ
+Name[tr]=Web'de TDE
+Name[tt]=TDE Päräwezdä
+Name[uk]=TDE в Тенетах
+Name[uz]=TDE veb-sahifalari
+Name[uz@cyrillic]=TDE веб-саҳифалари
+Name[vi]=TDE trên mạng
+Name[wa]=TDE sol waibe
+Name[zh_CN]=网上 TDE
+Name[zh_TW]=TDE 網站
 
 X-DOC-Weight=4000
diff --git a/khelpcenter/plugins/support.desktop b/khelpcenter/plugins/support.desktop
index 740e22473..9b72e4c64 100644
--- a/khelpcenter/plugins/support.desktop
+++ b/khelpcenter/plugins/support.desktop
@@ -1,83 +1,83 @@
 [Desktop Entry]
 DocPath=help:/khelpcenter/index.html?anchor=support
 
-Name=Supporting KDE
-Name[af]=Ondersteun KDE
-Name[ar]=دعم KDE
-Name[be]=Падтрымка KDE
-Name[bg]=Подпомагане на KDE
+Name=Supporting TDE
+Name[af]=Ondersteun TDE
+Name[ar]=دعم TDE
+Name[be]=Падтрымка TDE
+Name[bg]=Подпомагане на TDE
 Name[bn]=কে.ডি.ই-কে সহায়তা
-Name[br]=Skoazellañ KDE
-Name[bs]=Podržite KDE
-Name[ca]=Com col·laborar amb el KDE
-Name[cs]=Podpora KDE
-Name[csb]=Wspiarcë dlô KDE
-Name[cy]=Cefnogi KDE
-Name[da]=Støt KDE
-Name[de]=KDE unterstützen
-Name[el]=Υποστήριξη στο KDE
-Name[eo]=Subteni KDEon
-Name[es]=Colaborando con KDE
-Name[et]=KDE toetamine
-Name[eu]=KDEri lagunduz
-Name[fa]=پشتیبانی KDE
-Name[fi]=KDE:n tukeminen
-Name[fr]=Aider KDE
-Name[fy]=KDE stypje
-Name[ga]=Ag Tacú le KDE
-Name[gl]=Dar Apoio a KDE
-Name[he]=תמיכה ב־KDE
+Name[br]=Skoazellañ TDE
+Name[bs]=Podržite TDE
+Name[ca]=Com col·laborar amb el TDE
+Name[cs]=Podpora TDE
+Name[csb]=Wspiarcë dlô TDE
+Name[cy]=Cefnogi TDE
+Name[da]=Støt TDE
+Name[de]=TDE unterstützen
+Name[el]=Υποστήριξη στο TDE
+Name[eo]=Subteni TDEon
+Name[es]=Colaborando con TDE
+Name[et]=TDE toetamine
+Name[eu]=TDEri lagunduz
+Name[fa]=پشتیبانی TDE
+Name[fi]=TDE:n tukeminen
+Name[fr]=Aider TDE
+Name[fy]=TDE stypje
+Name[ga]=Ag Tacú le TDE
+Name[gl]=Dar Apoio a TDE
+Name[he]=תמיכה ב־TDE
 Name[hi]=केडीई को आधार दें
-Name[hr]=Podrška KDE-u
-Name[hu]=A KDE támogatása
-Name[is]=Styðja KDE
-Name[it]=Aiutare KDE
-Name[ja]=KDE 支援
-Name[ka]=KDE-ს მხარდაჭერა
-Name[kk]=KDE-ні қолдау
-Name[km]=ការ​គាំទ្រ KDE
-Name[ko]=KDE 지원
+Name[hr]=Podrška TDE-u
+Name[hu]=A TDE támogatása
+Name[is]=Styðja TDE
+Name[it]=Aiutare TDE
+Name[ja]=TDE 支援
+Name[ka]=TDE-ს მხარდაჭერა
+Name[kk]=TDE-ні қолдау
+Name[km]=ការ​គាំទ្រ TDE
+Name[ko]=TDE 지원
 Name[lo]=ເກມກີລາ
-Name[lt]=KDE palaikymas
-Name[lv]=KDE atbalstīšana
-Name[mk]=Поддршка за KDE
+Name[lt]=TDE palaikymas
+Name[lv]=TDE atbalstīšana
+Name[mk]=Поддршка за TDE
 Name[mn]=КДЭ дэмжилэг
-Name[ms]=KDE Sokongan
-Name[mt]=Appoġġja lill-KDE
-Name[nb]=Støtt KDE
-Name[nds]=KDE ünnerstütten
+Name[ms]=TDE Sokongan
+Name[mt]=Appoġġja lill-TDE
+Name[nb]=Støtt TDE
+Name[nds]=TDE ünnerstütten
 Name[ne]=केडीई समर्थन
-Name[nl]=KDE ondersteunen
-Name[nn]=Støtt KDE
-Name[nso]=Go Thekga KDE
-Name[pa]=KDE ਦੀ ਸਹਾਇਤਾ
-Name[pl]=Wspomaganie KDE
-Name[pt]=Apoiar o KDE
-Name[pt_BR]=Assistência ao KDE
-Name[ro]=Cum să ajutați Proiectul KDE
-Name[ru]=Поддержка KDE
-Name[rw]=Gufasha KDE 
-Name[se]=Doarjjo KDE
-Name[sk]=Podpora KDE
-Name[sl]=Podpiranje KDE
-Name[sr]=Подржавање KDE-а
-Name[sr@Latn]=Podržavanje KDE-a
-Name[sv]=Ge KDE ditt stöd
-Name[ta]=KDEஐ ஆதரிக்கிறது
+Name[nl]=TDE ondersteunen
+Name[nn]=Støtt TDE
+Name[nso]=Go Thekga TDE
+Name[pa]=TDE ਦੀ ਸਹਾਇਤਾ
+Name[pl]=Wspomaganie TDE
+Name[pt]=Apoiar o TDE
+Name[pt_BR]=Assistência ao TDE
+Name[ro]=Cum să ajutați Proiectul TDE
+Name[ru]=Поддержка TDE
+Name[rw]=Gufasha TDE
+Name[se]=Doarjjo TDE
+Name[sk]=Podpora TDE
+Name[sl]=Podpiranje TDE
+Name[sr]=Подржавање TDE-а
+Name[sr@Latn]=Podržavanje TDE-a
+Name[sv]=Ge TDE ditt stöd
+Name[ta]=TDEஐ ஆதரிக்கிறது
 Name[te]=కెడిఈ కి సహాయంచెయండి
-Name[tg]=Пуштибони KDE
-Name[th]=การสนับสนุน KDE
-Name[tr]=KDE'yi Destekleyin
-Name[tt]=KDE Teräge
-Name[uk]=Підтримка KDE
-Name[uz]=KDE'ni qoʻllab-quvvatlash
-Name[uz@cyrillic]=KDE'ни қўллаб-қувватлаш
-Name[ven]=U tikedza KDE
-Name[vi]=Hỗ trợ KDE
-Name[wa]=Sopoirter KDE
-Name[xh]=Ixhasa i KDE
-Name[zh_CN]=支持 KDE
-Name[zh_TW]=支援 KDE
-Name[zu]=Ixhasa i-KDE
+Name[tg]=Пуштибони TDE
+Name[th]=การสนับสนุน TDE
+Name[tr]=TDE'yi Destekleyin
+Name[tt]=TDE Teräge
+Name[uk]=Підтримка TDE
+Name[uz]=TDE'ni qoʻllab-quvvatlash
+Name[uz@cyrillic]=TDE'ни қўллаб-қувватлаш
+Name[ven]=U tikedza TDE
+Name[vi]=Hỗ trợ TDE
+Name[wa]=Sopoirter TDE
+Name[xh]=Ixhasa i TDE
+Name[zh_CN]=支持 TDE
+Name[zh_TW]=支援 TDE
+Name[zu]=Ixhasa i-TDE
 
 X-DOC-Weight=5000
diff --git a/kicker/kicker/buttons/exec.desktop b/kicker/kicker/buttons/exec.desktop
index ab30698f3..531e31783 100644
--- a/kicker/kicker/buttons/exec.desktop
+++ b/kicker/kicker/buttons/exec.desktop
@@ -1,125 +1,125 @@
 [Desktop Entry]
-Name=Non-KDE Application Launcher
-Name[af]=Nie-KDE Program Lanseerder
-Name[ar]=مُطلِق التطبيقات اغير KDE
-Name[be]=Запускальнік праграмы не-KDE
+Name=Non-TDE Application Launcher
+Name[af]=Nie-TDE Program Lanseerder
+Name[ar]=مُطلِق التطبيقات اغير TDE
+Name[be]=Запускальнік праграмы не-TDE
 Name[bg]=Стартиране на програми
 Name[bn]=নন-কে.ডি.ই অ্যাপলিকেশন লঞ্চার
-Name[bs]=Pokretač ne-KDE programa
-Name[ca]=Engegador d'aplicacions no KDE
-Name[cs]=Spouštěč aplikací nepatřících do KDE
-Name[csb]=Zrëszanié programów z bùtna KDE
-Name[da]=Starter ikke-KDE-programmer
-Name[de]=Nicht-KDE-Programm
-Name[el]=Εκτελεστής μη-KDE εφαρμογών
+Name[bs]=Pokretač ne-TDE programa
+Name[ca]=Engegador d'aplicacions no TDE
+Name[cs]=Spouštěč aplikací nepatřících do TDE
+Name[csb]=Zrëszanié programów z bùtna TDE
+Name[da]=Starter ikke-TDE-programmer
+Name[de]=Nicht-TDE-Programm
+Name[el]=Εκτελεστής μη-TDE εφαρμογών
 Name[eo]=neKDE-a Aplikaĵolanĉilo
-Name[es]=Aplicaciones No-KDE
-Name[et]=KDE-väliste rakenduste käivitaja
+Name[es]=Aplicaciones No-TDE
+Name[et]=TDE-väliste rakenduste käivitaja
 Name[eu]=KDEren ez diren aplikazio abiarazlea
-Name[fa]=راه‌انداز کاربرد غیر KDE
-Name[fi]=Ei-KDE:n sovellusten käynnistäjä
-Name[fr]=Lancement des applications non KDE
-Name[fy]=Net-KDE-programma's útfierder
-Name[ga]=Tosaitheoir Feidhmchlár Neamh-KDE
-Name[gl]=Lanzador de Aplicacións Non-KDE
-Name[he]=מפעיל תוכניות שלא שייכות למשפחת KDE
-Name[hr]=Pokretač vanjskih KDE aplikacija
-Name[hu]=Programindító nem KDE-s alkalmazásokhoz
-Name[is]=Ræsir fyrir ekki-KDE forrit
-Name[it]=Lancio di applicazioni non-KDE
-Name[ja]=KDE 以外のアプリケーションランチャー
-Name[ka]=არა KDE-ს პროგრამების 
-Name[kk]=KDE-ге тиесілі емес қолданбаларды жегу
-Name[km]=ឧបករណ៍​បើក​កម្មវិធី​មិន​មែន KDE
+Name[fa]=راه‌انداز کاربرد غیر TDE
+Name[fi]=Ei-TDE:n sovellusten käynnistäjä
+Name[fr]=Lancement des applications non TDE
+Name[fy]=Net-TDE-programma's útfierder
+Name[ga]=Tosaitheoir Feidhmchlár Neamh-TDE
+Name[gl]=Lanzador de Aplicacións Non-TDE
+Name[he]=מפעיל תוכניות שלא שייכות למשפחת TDE
+Name[hr]=Pokretač vanjskih TDE aplikacija
+Name[hu]=Programindító nem TDE-s alkalmazásokhoz
+Name[is]=Ræsir fyrir ekki-TDE forrit
+Name[it]=Lancio di applicazioni non-TDE
+Name[ja]=TDE 以外のアプリケーションランチャー
+Name[ka]=არა TDE-ს პროგრამების 
+Name[kk]=TDE-ге тиесілі емес қолданбаларды жегу
+Name[km]=ឧបករណ៍​បើក​កម្មវិធី​មិន​មែន TDE
 Name[ko]=프로그램 실행기
-Name[lt]=Ne-KDE programų startavimo priedas
-Name[mk]=Стартувач на не-KDE апликации
-Name[nb]=Last ikke-KDE-programmer
-Name[nds]=Starter för Nich-KDE-Programmen
-Name[ne]=KDE बाहेकको अनुप्रयोग सुरुआतकर्ता
-Name[nl]=Niet-KDE-programma's starten
-Name[nn]=Start av ikkje-KDE-program
-Name[pa]=ਨਾ-KDE ਕਾਰਜ ਸ਼ੁਰੂਆਤੀ
-Name[pl]=Uruchamianie programów spoza KDE
-Name[pt]=Lançador de Aplicações não-KDE
-Name[pt_BR]=Lançador de aplicativos que não são do KDE
-Name[ro]=Lansator de aplicații Non-KDE
-Name[ru]=Запуск приложения не из KDE
-Name[rw]=Bitari-KDE Porogaramu Mutangiza
-Name[se]=Ii-KDE prográmmaid álggaheaddji
-Name[sk]=Spúšťač non-KDE aplikácií
-Name[sl]=Zaganjalnik ne-KDE programov
-Name[sr]=Покретач не-KDE програма
-Name[sr@Latn]=Pokretač ne-KDE programa
-Name[sv]=Start av program som inte hör till KDE
-Name[th]=ตัวเรียกใช้งานแอพพลิเคชันที่ไม่ใช่ของ KDE
-Name[tr]=KDE Dışı Uygulama Başlatıcısı
-Name[tt]=KDE-bulmağan Yazılım Cibärgeç
-Name[uk]=Запуск не-KDE програм
-Name[uz]=No-KDE dasturlarni ishga tushuruvchi
-Name[uz@cyrillic]=Но-KDE дастурларни ишга тушурувчи
-Name[vi]=Trình khởi động Chương trình không của KDE
-Name[wa]=Enondeu di programes nén KDE
-Name[zh_CN]=非 KDE 应用程序启动器
-Name[zh_TW]=非-KDE 應用程式啟動器
-Comment=A launcher for programs not in the K Menu
-Comment[af]='n Lanseerder vir programme wat nie in die K-Kieslys voorkom nie
-Comment[ar]=مُطلِق البرامج غير التابعة لِلقائمة K
+Name[lt]=Ne-TDE programų startavimo priedas
+Name[mk]=Стартувач на не-TDE апликации
+Name[nb]=Last ikke-TDE-programmer
+Name[nds]=Starter för Nich-TDE-Programmen
+Name[ne]=TDE बाहेकको अनुप्रयोग सुरुआतकर्ता
+Name[nl]=Niet-TDE-programma's starten
+Name[nn]=Start av ikkje-TDE-program
+Name[pa]=ਨਾ-TDE ਕਾਰਜ ਸ਼ੁਰੂਆਤੀ
+Name[pl]=Uruchamianie programów spoza TDE
+Name[pt]=Lançador de Aplicações não-TDE
+Name[pt_BR]=Lançador de aplicativos que não são do TDE
+Name[ro]=Lansator de aplicații Non-TDE
+Name[ru]=Запуск приложения не из TDE
+Name[rw]=Bitari-TDE Porogaramu Mutangiza
+Name[se]=Ii-TDE prográmmaid álggaheaddji
+Name[sk]=Spúšťač non-TDE aplikácií
+Name[sl]=Zaganjalnik ne-TDE programov
+Name[sr]=Покретач не-TDE програма
+Name[sr@Latn]=Pokretač ne-TDE programa
+Name[sv]=Start av program som inte hör till TDE
+Name[th]=ตัวเรียกใช้งานแอพพลิเคชันที่ไม่ใช่ของ TDE
+Name[tr]=TDE Dışı Uygulama Başlatıcısı
+Name[tt]=TDE-bulmağan Yazılım Cibärgeç
+Name[uk]=Запуск не-TDE програм
+Name[uz]=No-TDE dasturlarni ishga tushuruvchi
+Name[uz@cyrillic]=Но-TDE дастурларни ишга тушурувчи
+Name[vi]=Trình khởi động Chương trình không của TDE
+Name[wa]=Enondeu di programes nén TDE
+Name[zh_CN]=非 TDE 应用程序启动器
+Name[zh_TW]=非-TDE 應用程式啟動器
+Comment=A launcher for programs not in the TDE Menu
+Comment[af]='n Lanseerder vir programme wat nie in die TDE-Kieslys voorkom nie
+Comment[ar]=مُطلِق البرامج غير التابعة لِلقائمة TDE
 Comment[be]=Запускальнік для праграмы, якой няма ў меню KDE
 Comment[bg]=Стартиране на програми, които са извън главното меню (К)
 Comment[bn]=কে-মেনু-তে নেই এমন প্রোগ্রাম-এর চালু করার জন্য একটি লঞ্চার
-Comment[bs]=Pokretač programa koji nisu u K meniju
-Comment[ca]=Un engegador de programes que no hi són al menú K
+Comment[bs]=Pokretač programa koji nisu u TDE meniju
+Comment[ca]=Un engegador de programes que no hi són al menú TDE
 Comment[cs]=Spouštěč pro programy nenacházející se v hlavní nabídce KDE
-Comment[csb]=Zrëszanié programów, jaczich nie dô w K menu
-Comment[da]=En starter af programmer der ikke er i K-Menuen
-Comment[de]=Startet Programme, die sich nicht im K-Menü befinden
-Comment[el]=Ένας εκτελεστής εφαρμογών που δε βρίσκονται στο Μενού K
-Comment[eo]=Lanĉilo por programoj ne en la K Menuo
-Comment[es]=Le permite ejecutar aplicaciones que no están en el Menu K
-Comment[et]=K menüüst puuduvate rakenduste käivitaja
-Comment[eu]=K Menuan ez dauden aplikazio abiarazlea
-Comment[fa]=یک راه‌انداز برای برای برنامه‌هایی که در گزینگان K نیست
-Comment[fi]=Käynnistäjä ohjelmille, jotka eivät ole K-valikossa
-Comment[fr]=Lancement des programmes n'étant pas dans le menu K
-Comment[fy]=In útfierder foar programma's hokker net yn it K-menu stean
+Comment[csb]=Zrëszanié programów, jaczich nie dô w TDE menu
+Comment[da]=En starter af programmer der ikke er i TDE-Menuen
+Comment[de]=Startet Programme, die sich nicht im TDE-Menü befinden
+Comment[el]=Ένας εκτελεστής εφαρμογών που δε βρίσκονται στο Μενού TDE
+Comment[eo]=Lanĉilo por programoj ne en la TDE Menuo
+Comment[es]=Le permite ejecutar aplicaciones que no están en el Menu TDE
+Comment[et]=TDE menüüst puuduvate rakenduste käivitaja
+Comment[eu]=TDE Menuan ez dauden aplikazio abiarazlea
+Comment[fa]=یک راه‌انداز برای برای برنامه‌هایی که در گزینگان TDE نیست
+Comment[fi]=Käynnistäjä ohjelmille, jotka eivät ole TDE-valikossa
+Comment[fr]=Lancement des programmes n'étant pas dans le menu TDE
+Comment[fy]=In útfierder foar programma's hokker net yn it TDE-menu stean
 Comment[gl]=Un lanzador para aplicacións que non estexan no Menu de KDE
 Comment[he]=מפעיל עבור יישומים שלא בתפריט המערכת
 Comment[hr]=Pokretač programa koji se ne nalaze na KDE izborniku
 Comment[hu]=Programindító
-Comment[is]=Ræsir fyrir forrit sem eru ekki í K valmyndinni
-Comment[it]=Per lanciare programmi che non sono nel menu K
-Comment[ja]=K メニューにないプログラムを起動
+Comment[is]=Ræsir fyrir forrit sem eru ekki í TDE valmyndinni
+Comment[it]=Per lanciare programmi che non sono nel menu TDE
+Comment[ja]=TDE メニューにないプログラムを起動
 Comment[kk]=KDE мәзрінде жоқ бағдарламаларды жегу
-Comment[km]=ឧបករណ៍​បើក​កម្មវិធី​ដែល​មិន​នៅ​ក្នុង​ម៉ឺនុយ K
-Comment[lt]=K meniu nesančių programų startavimo meniu
+Comment[km]=ឧបករណ៍​បើក​កម្មវិធី​ដែល​មិន​នៅ​ក្នុង​ម៉ឺនុយ TDE
+Comment[lt]=TDE meniu nesančių programų startavimo meniu
 Comment[mk]=Стартување на програми што не се во К-менито
 Comment[nb]=Mulighet til å starte programmer som ikke er i KDE-menyen
-Comment[nds]=En Starter för Programmen, de nich in't K-Menü staht
+Comment[nds]=En Starter för Programmen, de nich in't TDE-Menü staht
 Comment[ne]=के मेनुमा नभएका कार्यक्रमका लागि सुरुआतकर्ता
-Comment[nl]=Een starter voor het uitvoeren van programma's die niet in het K-menu staan
-Comment[nn]=Start av program som ikkje ligg i K-menyen
-Comment[pa]= ਕੇ(K) ਮੇਨੂ ਵਿੱਚ ਨਾ-ਮੌਜੂਦ ਕਾਰਜ ਲਈ ਸ਼ੁਰੂਆਤੀ ਹੈ
-Comment[pl]=Uruchamianie programów, które nie znajdują się w menu K
-Comment[pt]=Um lançador de programas que não estejam no Menu K
-Comment[pt_BR]=Um lançador para programas que não estão no Menu K
-Comment[ro]=Lansator de programe ce nu se află în meniul K
+Comment[nl]=Een starter voor het uitvoeren van programma's die niet in het TDE-menu staan
+Comment[nn]=Start av program som ikkje ligg i TDE-menyen
+Comment[pa]= ਕੇ(TDE) ਮੇਨੂ ਵਿੱਚ ਨਾ-ਮੌਜੂਦ ਕਾਰਜ ਲਈ ਸ਼ੁਰੂਆਤੀ ਹੈ
+Comment[pl]=Uruchamianie programów, które nie znajdują się w menu TDE
+Comment[pt]=Um lançador de programas que não estejam no Menu TDE
+Comment[pt_BR]=Um lançador para programas que não estão no Menu TDE
+Comment[ro]=Lansator de programe ce nu se află în meniul TDE
 Comment[ru]=Запуск приложений, не входящих в меню KDE
-Comment[rw]=Mutangiza w'amaporogaramu atari muri K Ibikubiyemo
+Comment[rw]=Mutangiza w'amaporogaramu atari muri TDE Ibikubiyemo
 Comment[sk]=Spúštač programov, ktoré nie sú v KDE Menu
 Comment[sl]=Zaganjalnik programov, ki se ne nahajajo v meniju KDE-ja
-Comment[sr]=Покретач за програме којих нема у K-менију
-Comment[sr@Latn]=Pokretač za programe kojih nema u K-meniju
-Comment[sv]=Start av program som inte finns i K-menyn
-Comment[th]=ตัวเรียกใช้งานโปรแกรมที่ไม่ได้อยู่ใน K menu
+Comment[sr]=Покретач за програме којих нема у TDE-менију
+Comment[sr@Latn]=Pokretač za programe kojih nema u TDE-meniju
+Comment[sv]=Start av program som inte finns i TDE-menyn
+Comment[th]=ตัวเรียกใช้งานโปรแกรมที่ไม่ได้อยู่ใน TDE menu
 Comment[tr]=KDE menüsünde bulunmayan programlar için bir başlatıcı
-Comment[tt]=K-Saylaqta bulmağan yazılımnar cibärgeçe
-Comment[uk]=Запуск програм, яких немає в K Меню
-Comment[uz]=K-menyuga qoʻshilmagan dasturlarni ishga tushirish
+Comment[tt]=TDE-Saylaqta bulmağan yazılımnar cibärgeçe
+Comment[uk]=Запуск програм, яких немає в TDE Меню
+Comment[uz]=TDE-menyuga qoʻshilmagan dasturlarni ishga tushirish
 Comment[uz@cyrillic]=К-менюга қўшилмаган дастурларни ишга тушириш
 Comment[vi]=Trình khởi động các chương trình không có trong thực đơn của KDE
-Comment[wa]=On enondeu po les programes ki n' sont nén dins l' dressêye K
-Comment[zh_CN]=启动不在 K 菜单中的程序
-Comment[zh_TW]=用於不在 K 選單中的程式啟動器
+Comment[wa]=On enondeu po les programes ki n' sont nén dins l' dressêye TDE
+Comment[zh_CN]=启动不在 TDE 菜单中的程序
+Comment[zh_TW]=用於不在 TDE 選單中的程式啟動器
 Icon=exec
 X-KDE-Library=ExecButton
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index e91a06f37..a12e48bce 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "nonkdeappbutton.moc"
 
 // this is one of the two constructors. gets called when creating a new button
-// e.g. via the "non-KDE Application" dialog, not one that was saved and then
+// e.g. via the "non-TDE Application" dialog, not one that was saved and then
 // restored.
 NonKDEAppButton::NonKDEAppButton(const TQString& name,
                                  const TQString& description,
@@ -242,7 +242,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
     if (!result)
     {
         // something went wrong, so let's show an error msg to the user
-        KMessageBox::error(this, i18n("Cannot execute non-KDE application."),
+        KMessageBox::error(this, i18n("Cannot execute non-TDE application."),
                            i18n("Kicker Error"));
         return;
     }
diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h
index 217f2c22c..2676a667c 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.h
+++ b/kicker/kicker/buttons/nonkdeappbutton.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class PanelExeDialog;
 
 /**
- * Button that contains a non-KDE application
+ * Button that contains a non-TDE application
  * subclass of PanelButton
  */
 class NonKDEAppButton : public PanelButton
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 78b4d4ab1..d268d21ab 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -177,7 +177,7 @@ public:
                              TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "ExecButton"; }
     virtual TQString icon() const { return "exec"; }
-    virtual TQString visibleName() const { return i18n("Non-KDE Application"); }
+    virtual TQString visibleName() const { return i18n("Non-TDE Application"); }
 };
 
 class ExtensionButtonContainer : public ButtonContainer
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index ce047938b..4fb717a7e 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1332,7 +1332,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             }
             else if (fi.isExecutable())
             {
-                // non-KDE executable
+                // non-TDE executable
                 TQString pixmapFile;
                 KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
                                         KIcon::DefaultState, &pixmapFile);
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 6b1dd15ef..209e08270 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -49,11 +49,11 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
                                const TQString &path, const TQString &icon,
                                const TQString &cmd, bool inTerm,
                                TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, false, i18n("Non-KDE Application Configuration"), Ok|Cancel, Ok, true),
+    : KDialogBase(parent, name, false, i18n("Non-TDE Application Configuration"), Ok|Cancel, Ok, true),
       m_icon(icon.isEmpty() ? "exec" : icon),
       m_iconChanged(false)
 {
-    setCaption(i18n("Non-KDE Application Configuration"));
+    setCaption(i18n("Non-TDE Application Configuration"));
     TQFileInfo fi(path);
 
     ui = new NonKDEButtonSettings(makeVBoxMainWidget());
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 8dcc2fbde..6cb184c72 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -375,7 +375,7 @@ void PanelServiceMenu::doInitialize()
 
         if (relPath_ == "")
         {
-            insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-KDE Application"),
+            insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-TDE Application"),
                        this, TQT_SLOT(addNonKDEApp()));
         }
 
diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto
index a1d4925a5..d15cb7034 100644
--- a/kioslave/DEBUG.howto
+++ b/kioslave/DEBUG.howto
@@ -18,7 +18,7 @@ that slaves for a certain protocol are started in debug mode.
 
 E.g. to start all 'http' slaves in debug mode, you type:
 
-	KDE_SLAVE_DEBUG_WAIT=http tdeinit
+	TDE_SLAVE_DEBUG_WAIT=http tdeinit
 
 This will restart 'tdeinit' and 'klauncher'.
 
@@ -51,13 +51,13 @@ Debugging io-slaves with valgrind
 KLauncher can be told to run certain io-slaves through valgrind. The following
 command can be used to let klauncher run all https io-slaves via valgrind:
 
-	KDE_SLAVE_VALGRIND=https tdeinit
+	TDE_SLAVE_VALGRIND=https tdeinit
 
 The valgrind output will appear as the stderr output of the tdeinit process.
 The $VALGRIND_OPTS environment variable can be used to pass options to valgrind.
 If you want to use a different skin:
 
-	KDE_SLAVE_VALGRIND_SKIN=calltree      ( for example )
+	TDE_SLAVE_VALGRIND_SKIN=calltree      ( for example )
 
 
 How to get debug output
diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h
index 617245f80..3a0db59e6 100644
--- a/kioslave/man/kio_man.h
+++ b/kioslave/man/kio_man.h
@@ -90,8 +90,8 @@ private:
     TQString mySgml2RoffPath;
     void getProgramPath();
 
-    TQCString m_htmlPath; ///< Path to KDE resources, encoded for HTML
-    TQCString m_cssPath; ///< Path to KDE resources, encoded for CSS
+    TQCString m_htmlPath; ///< Path to TDE resources, encoded for HTML
+    TQCString m_cssPath; ///< Path to TDE resources, encoded for CSS
     TQBuffer m_outputBuffer; ///< Buffer for the output
     TQString m_manCSSFile; ///< Path to kio_man.css
 };
diff --git a/kioslave/man/man2html.h b/kioslave/man/man2html.h
index e4d19a87b..68b01efe9 100644
--- a/kioslave/man/man2html.h
+++ b/kioslave/man/man2html.h
@@ -12,10 +12,10 @@
 void scan_man_page(const char *man_page);
 
 /**
- * Set the paths to KDE resources
+ * Set the paths to TDE resources
  *
- * \param htmlPath Path to the KDE resources, encoded for HTML
- * \param cssPath Path to the KDE resources, encoded for CSS
+ * \param htmlPath Path to the TDE resources, encoded for HTML
+ * \param cssPath Path to the TDE resources, encoded for CSS
  * \since 3.5
  *
  */
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index fb6927d3e..94d33771a 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -73,14 +73,14 @@ int main(int argc, char *argv[])
     // However this assume your $HOME doesn't use characters from other locales...
     setenv( "LC_ALL", "en_GB.ISO-8859-1", 1 );
 #ifdef UTF8TEST
-    setenv( "KDE_UTF8_FILENAMES", "true", 1 );
+    setenv( "TDE_UTF8_FILENAMES", "true", 1 );
 #else
-    unsetenv( "KDE_UTF8_FILENAMES" );
+    unsetenv( "TDE_UTF8_FILENAMES" );
 #endif
 
     // Use another directory than the real one, just to keep things clean
     setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true );
+    setenv( "TDE_FORK_SLAVES", "yes", true );
 
     KApplication::disableAutoDcopRegistration();
     KCmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp
index 81d1c7e52..8e644dd54 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -28,7 +28,7 @@
 #include "kmenuedit.h"
 #include "khotkeys.h"
 
-static const char description[] = I18N_NOOP("KDE menu editor");
+static const char description[] = I18N_NOOP("TDE menu editor");
 static const char version[] = "0.7";
 
 static const KCmdLineOptions options[] =
@@ -64,7 +64,7 @@ public:
 
 extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 {
-    KAboutData aboutData("kmenuedit", I18N_NOOP("KDE Menu Editor"),
+    KAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"),
 			 version, description, KAboutData::License_GPL,
 			 "(C) 2000-2003, Waldo Bastian, Raffaele Sandrini, Matthias Elter");
     aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Maintainer"), "bastian@kde.org");
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index caf909d68..5a9742ae4 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -104,8 +104,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
         openInSameWindow.setAttribute( "name", "sameview" );
         openInSameWindow.setAttribute( "group", "tabhandling" );
         menu.appendChild( openInSameWindow );
-        
-	TQDomElement openInWindow = m_doc.createElement( "action" );
+
+        TQDomElement openInWindow = m_doc.createElement( "action" );
         openInWindow.setAttribute( "name", "newview" );
         openInWindow.setAttribute( "group", "tabhandling" );
         menu.appendChild( openInWindow );
@@ -115,6 +115,11 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
         openInTabElement.setAttribute( "group", "tabhandling" );
         menu.appendChild( openInTabElement );
 
+        TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
+        openInTabFrontElement.setAttribute( "name", "openintabfront" );
+        openInTabFrontElement.setAttribute( "group", "tabhandling" );
+        menu.appendChild( openInTabFrontElement );
+
         TQDomElement separatorElement = m_doc.createElement( "separator" );
         separatorElement.setAttribute( "group", "tabhandling" );
         menu.appendChild( separatorElement );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index f6f4759e9..bc9bc4135 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -2726,6 +2726,14 @@ void KonqMainWindow::slotPopupThisWindow()
     openURL( 0L, popupItems.getFirst()->url() );
 }
 
+void KonqMainWindow::slotPopupNewTabAtFront()
+{
+    KConfig *config = KGlobal::config();
+    KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
+    bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
+    popupNewTab(true, openAfterCurrentPage);
+}
+
 void KonqMainWindow::slotPopupNewTab()
 {
     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
@@ -4782,8 +4790,14 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       else
         tab_new_x = "tab_new_bg" ;
 
-      actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
-      actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
+      KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
+      actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
+      KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
+      actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
+      actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+      actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
+      actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
+      actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
       doTabHandling = true;
   }
 
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index f5068d98f..12e7d8df4 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -444,6 +444,7 @@ protected slots:
   void slotPopupNewWindow();
   void slotPopupThisWindow();
   void slotPopupNewTab();
+  void slotPopupNewTabAtFront();
   void slotPopupNewTabRight();
   void slotPopupPasteTo();
   void slotRemoveView();
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 26b93dfd9..d164bb242 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -70,7 +70,7 @@ void sanity_check( int argc, char* argv[] )
 {
   TQCString msg;
   TQCString path = getenv("HOME");
-  TQCString readOnly = getenv("KDE_HOME_READONLY");
+  TQCString readOnly = getenv("TDE_HOME_READONLY");
   if (path.isEmpty())
   {
      msg = "$HOME not set!";
diff --git a/ksysguard/example/eventsrc b/ksysguard/example/eventsrc
index 5051f0cf2..c93305fdb 100644
--- a/ksysguard/example/eventsrc
+++ b/ksysguard/example/eventsrc
@@ -1,83 +1,83 @@
 [!Global!]
 IconName=ksysguard
-Comment=KDE System Guard
-Comment[af]=KDE Stelsel Wag
-Comment[ar]=حارس النظام KDE
-Comment[az]=KDE Sistem Cangüdəni
-Comment[be]=Ахоўнік сістэмы KDE
+Comment=System Guard
+Comment[af]=Stelsel Wag
+Comment[ar]=حارس النظام
+Comment[az]=Sistem Cangüdəni
+Comment[be]=Ахоўнік сістэмы
 Comment[bg]=Системна защита
 Comment[bn]=কে.ডি.ই. সিস্টেম গার্ড
-Comment[br]=Gward Reizhiad KDE
-Comment[bs]=KDE zaštita sistema
-Comment[ca]=Vigilant del sistema KDE
-Comment[cs]=Správce systému KDE
-Comment[csb]=KDE Wachtôrz Systemë
-Comment[cy]=Gwarchodwr Cysawd KDE
-Comment[da]=KDE Systemvagt
-Comment[de]=KDE-Systemüberwachung
-Comment[el]=Φρουρός συστήματος του KDE
-Comment[eo]=KDE-Sistemobservilo
-Comment[es]=Guardián del sistema de KDE
-Comment[et]=KDE süsteemi valvur
-Comment[eu]=KDEren sistemaren kontrola
-Comment[fa]=محافظ سیستم KDE
-Comment[fi]=KDE:n järjestelmänvalvonta
+Comment[br]=Gward Reizhiad
+Comment[bs]=zaštita sistema
+Comment[ca]=Vigilant del sistema
+Comment[cs]=Správce systému
+Comment[csb]=Wachtôrz Systemë
+Comment[cy]=Gwarchodwr Cysawd
+Comment[da]=Systemvagt
+Comment[de]=Systemüberwachung
+Comment[el]=Φρουρός συστήματος του
+Comment[eo]=Sistemobservilo
+Comment[es]=Guardián del sistema de
+Comment[et]=süsteemi valvur
+Comment[eu]=ren sistemaren kontrola
+Comment[fa]=محافظ سیستم
+Comment[fi]=järjestelmänvalvonta
 Comment[fr]=Surveillance du système
-Comment[fy]=KDE systeembefeiliging
-Comment[ga]=Garda an Chórais KDE
-Comment[gl]=Vixiante do Sistema de KDE
-Comment[he]=משמר המערכת של KDE
+Comment[fy]=systeembefeiliging
+Comment[ga]=Garda an Chórais
+Comment[gl]=Vixiante do Sistema de
+Comment[he]=משמר המערכת של
 Comment[hi]=केडीई तंत्र गार्ड
-Comment[hr]=KDE zaštitnik sustava
-Comment[hu]=KDE rendszermonitor
-Comment[is]=KDE kerfisvörður
-Comment[it]=Controllo di sistema di KDE
-Comment[ja]=KDE システムガード
-Comment[ka]=KDE სისტემური მონიტორი
-Comment[kk]=KDE жүйелік бақылаушысы
-Comment[km]=ការពារ​ប្រព័ន្ធ KDE
-Comment[ko]=KDE 시스템 지킴이
-Comment[lo]=ເຄື່ອງມືຶປ້ອງກັນລະບົບຂອງ KDE
-Comment[lt]=KDE sistemos apsauga
-Comment[lv]=KDE Sistēmas Sargs
-Comment[mk]=KDE Системски чувар
+Comment[hr]=zaštitnik sustava
+Comment[hu]=rendszermonitor
+Comment[is]=kerfisvörður
+Comment[it]=Controllo di sistema di
+Comment[ja]=システムガード
+Comment[ka]=სისტემური მონიტორი
+Comment[kk]=жүйелік бақылаушысы
+Comment[km]=ការពារ​ប្រព័ន្ធ
+Comment[ko]=시스템 지킴이
+Comment[lo]=ເຄື່ອງມືຶປ້ອງກັນລະບົບຂອງ
+Comment[lt]=sistemos apsauga
+Comment[lv]=Sistēmas Sargs
+Comment[mk]=Системски чувар
 Comment[mn]=КДЭ-Системийн хяналт
-Comment[ms]=Pengawas Sistem KDE
-Comment[mt]=Gwardja tas-Sistema KDE
-Comment[nb]=KDE Systemovervåker
-Comment[nds]=KDE-Systeemwachter
-Comment[ne]=KDE प्रणाली रक्षक
-Comment[nl]=KDE systeembewaking
-Comment[nn]=KDE Systemvakt
-Comment[nso]=Thlokomelo ya System ya KDE
-Comment[pa]=KDE ਸਿਸਟਮ ਗਾਰਡ
-Comment[pl]=KDE Strażnik Systemu
-Comment[pt]=Vigilante do sistema do KDE
-Comment[pt_BR]=Sistema de Guarda do KDE
-Comment[ro]=Sistem de gardă KDE
+Comment[ms]=Pengawas Sistem
+Comment[mt]=Gwardja tas-Sistema
+Comment[nb]=Systemovervåker
+Comment[nds]=Systeemwachter
+Comment[ne]=प्रणाली रक्षक
+Comment[nl]=systeembewaking
+Comment[nn]=Systemvakt
+Comment[nso]=Thlokomelo ya System ya
+Comment[pa]=ਸਿਸਟਮ ਗਾਰਡ
+Comment[pl]=Strażnik Systemu
+Comment[pt]=Vigilante do sistema do
+Comment[pt_BR]=Sistema de Guarda do
+Comment[ro]=Sistem de gardă
 Comment[ru]=Системный монитор
-Comment[rw]=Umurinzi Sisitemu KDE
-Comment[se]=KDE vuogádatfákta
-Comment[sk]=KDE Strážca systému
-Comment[sl]=Sistemski varuh KDE
-Comment[sr]=KDE чувар система
-Comment[sr@Latn]=KDE čuvar sistema
-Comment[sv]=KDE:s systemövervakare
-Comment[ta]=KDE கணினி காவலன்
-Comment[tg]=Муҳофизи системаи KDE
-Comment[th]=เครื่องมือป้องกันระบบ KDE
-Comment[tr]=KDE Sistem Koruyucu
-Comment[tt]=KDE'nıñ Sistem Saqçısı
-Comment[uk]=Системний вартовий KDE
-Comment[uz]=KDE tizim nazoratchisi
-Comment[uz@cyrillic]=KDE тизим назоратчиси
-Comment[ven]=Mulindi wa maitele a KDE
-Comment[vi]=Trình bảo vệ Hệ thống KDE
-Comment[wa]=Gåre sistinme KDE
-Comment[xh]=KDE Ukhuselo lendlela yokusebenza
-Comment[zh_CN]=KDE 系统卫士
-Comment[zh_TW]=KDE 系統守衛
-Comment[zu]=Unogada Wesistimu ye-KDE
+Comment[rw]=Umurinzi Sisitemu
+Comment[se]=vuogádatfákta
+Comment[sk]=Strážca systému
+Comment[sl]=Sistemski varuh
+Comment[sr]=чувар система
+Comment[sr@Latn]=čuvar sistema
+Comment[sv]=systemövervakare
+Comment[ta]=கணினி காவலன்
+Comment[tg]=Муҳофизи системаи
+Comment[th]=เครื่องมือป้องกันระบบ
+Comment[tr]=Sistem Koruyucu
+Comment[tt]=nıñ Sistem Saqçısı
+Comment[uk]=Системний вартовий
+Comment[uz]=tizim nazoratchisi
+Comment[uz@cyrillic]=тизим назоратчиси
+Comment[ven]=Mulindi wa maitele a
+Comment[vi]=Trình bảo vệ Hệ thống
+Comment[wa]=Gåre sistinme
+Comment[xh]=Ukhuselo lendlela yokusebenza
+Comment[zh_CN]=系统卫士
+Comment[zh_TW]=系統守衛
+Comment[zu]=Unogada Wesistimu ye
 
 [pattern_match]
 Name=pattern_match
@@ -91,7 +91,7 @@ Name[eo]=ŝablon_serĉo
 Name[es]=concordancia de patrón
 Name[fr]=correspondance_avec_motif
 Name[gl]=patrón_coincidente
-Name[hi]=पैटर्न-मैच 
+Name[hi]=पैटर्न-मैच
 Name[hr]=pronalaženje_uzoraka
 Name[hu]=illeszkedő_minta
 Name[it]=corrispondenza_schema
@@ -204,7 +204,7 @@ Name[hi]=सेंसर-अलार्म
 Name[hr]=osjetilo_alarma
 Name[hu]=érzékelő_riasztás
 Name[it]=allarme_dei_sensori
-Name[ja]=センサーアラーム
+Name[ja]=センサーアラー�
 Name[km]=សំឡេង​រោទិ៍​ឧបករណ៍​ស្ទង់
 Name[ko]=센서 알람
 Name[lo]=ການເຕື່ອນກວດຈັບ
@@ -282,7 +282,7 @@ Comment[pt]=o sensor excedeu o limite crítico
 Comment[pt_BR]=Sensor excedeu o limite crítico
 Comment[ro]=Senzorul a depășit limita critică
 Comment[ru]=Датчик превысил критический предел
-Comment[rw]= Rukuruzi yarenze impera ngombwa 
+Comment[rw]= Rukuruzi yarenze impera ngombwa
 Comment[sk]=Senzor prekročil kritický limit
 Comment[sl]=Senzor je presegel kritično mejo
 Comment[sr]=Сензор је прешао дозвољену границу
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 889b92abf..f9ba44e6c 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -302,7 +302,7 @@ static int startApp()
     
     if (!new_dcop)
     {
-        TQCString ksycoca = "KDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca"));
+        TQCString ksycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca"));
         env << ksycoca;
 
         options += "xf"; // X-only, dcop forwarding enabled.
diff --git a/tdm/kfrontend/tdmctl.c b/tdm/kfrontend/tdmctl.c
index d6abe959a..a0d9a41f8 100644
--- a/tdm/kfrontend/tdmctl.c
+++ b/tdm/kfrontend/tdmctl.c
@@ -45,7 +45,7 @@ openctl( int fd, int err, const char *ctl, const char *dpy )
 	if (!connect( fd, (struct sockaddr *)&sa, sizeof(sa) ))
 		return 1;
 	if (err)
-		fprintf( stderr, "Cannot connect socket '%s'.\n", sa.sun_path );
+		fprintf( stderr, "[tdmctl] Cannot connect socket '%s'.\n", sa.sun_path );
 	return 0;
 }
 
@@ -58,9 +58,7 @@ readcfg( const char *cfg )
 	char buf[1024];
 
 	if (!(fp = fopen( cfg, "r" ))) {
-		fprintf( stderr,
-		         "Cannot open tdm config file '%s'.\n",
-		         cfg );
+		fprintf( stderr, "[tdmctl] Cannot open tdm config file '%s'.\n", cfg );
 		return 0;
 	}
 	ctl = "/var/run/xdmctl";
@@ -90,7 +88,7 @@ exe( int fd, const char *in, int len )
 	char buf[4096];
 
 	if (write( fd, in, len ) != len) {
-		fprintf( stderr, "Cannot send command\n" );
+		fprintf( stderr, "[tdmctl] Cannot send command\n" );
 		return 1;
 	}
 	do {
@@ -138,7 +136,7 @@ run( int fd, char **argv )
 		buf[len++] = '\n';
 		return exe( fd, buf, len );
 	  bad:
-		fprintf( stderr, "Command too long\n" );
+		fprintf( stderr, "[tdmctl] Command too long\n" );
 		return 1;
 	}
 }
@@ -201,20 +199,20 @@ main( int argc, char **argv )
 		} else if (!strcmp( ptr, "c" ) || !strcmp( ptr, "config" )) {
 			if (!argv[1]) {
 			  needarg:
-				fprintf( stderr, "Option '%s' needs argument.\n",
+				fprintf( stderr, "[tdmctl] Option '%s' needs argument.\n",
 				         ptr );
 				return 1;
 			}
 			cfg = *++argv;
 		} else {
-			fprintf( stderr, "Unknown option '%s'.\n", ptr );
+			fprintf( stderr, "[tdmctl] Unknown option '%s'.\n", ptr );
 			return 1;
 		}
 	}
 	if ((!ctl || !*ctl) && *cfg)
 		ctl = readcfg( cfg );
 	if ((fd = socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) {
-		fprintf( stderr, "Cannot create UNIX socket\n" );
+		fprintf( stderr, "[tdmctl] Cannot create UNIX socket\n" );
 		return 1;
 	}
 	if (dpy && (ptr = strchr( dpy, ':' )) && (ptr = strchr( ptr, '.' )))
@@ -226,7 +224,7 @@ main( int argc, char **argv )
 		if (!openctl( fd, 0, "/var/run/xdmctl", dpy ) &&
 		    !openctl( fd, 0, "/var/run", dpy ))
 		{
-			fprintf( stderr, "No command socket found.\n" );
+			fprintf( stderr, "[tdmctl] No command socket found.\n" );
 			return 1;
 		}
 	}
diff --git a/tqt3integration/module/kdeintegration.desktop b/tqt3integration/module/kdeintegration.desktop
index 0f41e5e99..bb41bd97f 100644
--- a/tqt3integration/module/kdeintegration.desktop
+++ b/tqt3integration/module/kdeintegration.desktop
@@ -10,4 +10,4 @@ X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
 
 Name=KDE Integration Module
-Comment=Module for integrating UI of non-KDE applications
+Comment=Module for integrating UI of non-TDE applications
diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
index 2b9d5e5bb..947109afd 100644
--- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
+++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
@@ -41,9 +41,9 @@ bool TQKDEIntegration::enabled()
 
 static TQCString findLibrary()
     {
-    if( getenv( "KDE_FULL_SESSION" ) == NULL )
+    if( getenv( "TDE_FULL_SESSION" ) == NULL )
         return "";
-    if( getenv( "KDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "KDE_FULL_SESSION" )[ 0 ] != '1' )
+    if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' )
         return "";
     if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL
         || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
diff --git a/twin/HACKING b/twin/HACKING
index 3cee26330..519322cb8 100644
--- a/twin/HACKING
+++ b/twin/HACKING
@@ -4,7 +4,7 @@ Mailing list and bugzilla:
 The KWin mailing list is twin@kde.org . It's rather low traffic.
 
 The bugs.kde.org product for KWin is 'twin'. Currently the components are 'general' (KWin core),
-'decorations' (decoration plugins), 'compatibility' (problems with non-KDE WMs/apps) and
+'decorations' (decoration plugins), 'compatibility' (problems with non-TDE WMs/apps) and
 'eyecandy' (transparency and similar effects).
 There are also two kcontrol components 'kcmtwindecoration' and 'kcmtwinoptions' related
 to KWin's KControl modules.
diff --git a/twin/eventsrc b/twin/eventsrc
index 20c3c9473..a8b3dd64f 100644
--- a/twin/eventsrc
+++ b/twin/eventsrc
@@ -1,85 +1,85 @@
 [!Global!]
 IconName=twin
-Comment=The KDE Window Manager
-Comment[af]=Die KDE Venster Bestuurder
-Comment[ar]=مسير KDE للنوافذ
-Comment[az]=KDE Pəncərə İdarəcisi
-Comment[be]=Кіраўнік вокнаў KDE
+Comment=The Window Manager
+Comment[af]=Die Venster Bestuurder
+Comment[ar]=مسير للنوافذ
+Comment[az]=Pəncərə İdarəcisi
+Comment[be]=Кіраўнік вокнаў
 Comment[bg]=Мениджър на прозорци
 Comment[bn]=কে.ডি.ই উইণ্ডো ম্যানেজার
-Comment[br]=Merour prenester KDE
-Comment[bs]=KDE upravitelj prozorima
-Comment[ca]=El gestor de finestres KDE
-Comment[cs]=Správce oken KDE
-Comment[csb]=Menedżer òknów KDE
-Comment[cy]=Y Trefnydd Ffenestri KDE
-Comment[da]=KDE Vindueshåndtering
-Comment[de]=KDE-Fenstermanager
-Comment[el]=Ο διαχειριστής παραθύρων του KDE
-Comment[eo]=KDE-fenestroadministrilo
-Comment[es]=El gestor de ventanas de KDE
-Comment[et]=KDE aknahaldur
-Comment[eu]=KDEren leiho kudeatzailea
-Comment[fa]=مدیر پنجره KDE
-Comment[fi]=KDE:n ikkunaohjelma
-Comment[fr]=Le gestionnaire de fenêtres de KDE
-Comment[fy]=De KDE-windowmanager
-Comment[ga]=Bainisteoir Fuinneoga KDE
-Comment[gl]=O Xestor de Fiestras de KDE
-Comment[he]=מנהל החלונות של KDE
+Comment[br]=Merour prenester
+Comment[bs]=upravitelj prozorima
+Comment[ca]=El gestor de finestres
+Comment[cs]=Správce oken
+Comment[csb]=Menedżer òknów
+Comment[cy]=Y Trefnydd Ffenestri
+Comment[da]=Vindueshåndtering
+Comment[de]=Fenstermanager
+Comment[el]=Ο διαχειριστής παραθύρων του
+Comment[eo]=fenestroadministrilo
+Comment[es]=El gestor de ventanas de
+Comment[et]=aknahaldur
+Comment[eu]=ren leiho kudeatzailea
+Comment[fa]=مدیر پنجره
+Comment[fi]=ikkunaohjelma
+Comment[fr]=Le gestionnaire de fenêtres de
+Comment[fy]=De-windowmanager
+Comment[ga]=Bainisteoir Fuinneoga
+Comment[gl]=O Xestor de Fiestras de
+Comment[he]=מנהל החלונות של
 Comment[hi]=केडीई विंडो प्रबंधक
-Comment[hr]=KDE upravitelj prozorima
-Comment[hu]=KDE ablakkezelő
-Comment[id]=Manajer Jendela KDE
-Comment[is]=Gluggastjóri KDE
-Comment[it]=Il window manager di KDE
-Comment[ja]=KDE ウィンドウマネージャ
-Comment[ka]=KDE ფანჯრის მენეჯერი
-Comment[kk]=KDE терезе менеджері
-Comment[km]=កម្មវិធី​គ្រប់គ្រង​បង្អួច KDE
-Comment[ko]=KDE 창 관리자
-Comment[lo]=ລະບົບຈັດການຫນ້າຕ່າງຂອງ KDE
-Comment[lt]=KDE langų tvarkyklė
-Comment[lv]=KDE Logu Menedžeris
-Comment[mk]=Менаџерот на прозорци на KDE
+Comment[hr]=upravitelj prozorima
+Comment[hu]=ablakkezelő
+Comment[id]=Manajer Jendela
+Comment[is]=Gluggastjóri
+Comment[it]=Il window manager di
+Comment[ja]=ウィンドウマネージャ
+Comment[ka]=ფანჯრის მენეჯერი
+Comment[kk]=терезе менеджері
+Comment[km]=កម្មវិធី​គ្រប់គ្រង​បង្អួច
+Comment[ko]=창 관리자
+Comment[lo]=ລະບົບຈັດການຫນ້າຕ່າງຂອງ
+Comment[lt]=langų tvarkyklė
+Comment[lv]=Logu Menedžeris
+Comment[mk]=Менаџерот на прозорци на
 Comment[mn]=КДЭ-Цонхны удирдагч
-Comment[ms]=Pengurus Tetingkap KDE
-Comment[mt]=Window manager tal-KDE
-Comment[nb]=KDE Vindusbehandler
-Comment[nds]=De Finsterpleger vun KDE
-Comment[ne]=KDE सञ्झ्याल प्रबन्धक
-Comment[nl]=De KDE-windowmanager
-Comment[nn]=KDE Vindaugshandterar
-Comment[nso]=Molaodi wa Window ya KDE
-Comment[oc]=Lo gestionari de finestres KDE
-Comment[pa]=KDE ਝਰੋਖਾ ਮੈਨੇਜਰ
-Comment[pl]=Menedżer okien KDE
-Comment[pt]=Gestor de janelas do KDE
-Comment[pt_BR]=Gerenciador de Janelas do KDE
-Comment[ro]=Managerul de ferestre KDE
+Comment[ms]=Pengurus Tetingkap
+Comment[mt]=Window manager tal
+Comment[nb]=Vindusbehandler
+Comment[nds]=De Finsterpleger vun
+Comment[ne]=सञ्झ्याल प्रबन्धक
+Comment[nl]=De-windowmanager
+Comment[nn]=Vindaugshandterar
+Comment[nso]=Molaodi wa Window ya
+Comment[oc]=Lo gestionari de finestres
+Comment[pa]=ਝਰੋਖਾ ਮੈਨੇਜਰ
+Comment[pl]=Menedżer okien
+Comment[pt]=Gestor de janelas do
+Comment[pt_BR]=Gerenciador de Janelas do
+Comment[ro]=Managerul de ferestre
 Comment[ru]=Оконный менеджер
-Comment[rw]=Mugenga w'Idirishya KDE
-Comment[se]=KDE lásegieđahalli
-Comment[sk]=Správca okien KDE
-Comment[sl]=Okenski upravitelj KDE
-Comment[sr]=KDE менаџер прозора
-Comment[sr@Latn]=KDE menadžer prozora
-Comment[sv]=KDE:s fönsterhanterare
-Comment[ta]=KDE சாளர மேலாளர்
-Comment[tg]=Мудири тирезаи KDE
-Comment[th]=ระบบจัดการหน้าต่างของ KDE
-Comment[tr]=KDE Pencere Yöneticisi
-Comment[tt]=KDE Täräzä İdäräçe
-Comment[uk]=Менеджер вікон KDE
-Comment[uz]=KDE oyna boshqaruvchi
-Comment[uz@cyrillic]=KDE ойна бошқарувчи
-Comment[ven]=Mulanguli wa windo ya KDE
-Comment[vi]=Trình quản lí Cửa sổ của KDE
-Comment[wa]=Li manaedjeu di purneas di KDE
-Comment[xh]=Umphathi we Window ye KDE
-Comment[zh_CN]=KDE 窗口管理器
-Comment[zh_TW]=KDE 視窗管理程式
-Comment[zu]=Imenenja yama-Window ye-KDE
+Comment[rw]=Mugenga w'Idirishya
+Comment[se]=lásegieđahalli
+Comment[sk]=Správca okien
+Comment[sl]=Okenski upravitelj
+Comment[sr]=менаџер прозора
+Comment[sr@Latn]=menadžer prozora
+Comment[sv]=fönsterhanterare
+Comment[ta]=சாளர மேலாளர்
+Comment[tg]=Мудири тирезаи
+Comment[th]=ระบบจัดการหน้าต่างของ
+Comment[tr]=Pencere Yöneticisi
+Comment[tt]=Täräzä İdäräçe
+Comment[uk]=Менеджер вікон
+Comment[uz]=oyna boshqaruvchi
+Comment[uz@cyrillic]=ойна бошқарувчи
+Comment[ven]=Mulanguli wa windo ya
+Comment[vi]=Trình quản lí Cửa sổ của
+Comment[wa]=Li manaedjeu di purneas di
+Comment[xh]=Umphathi we Window ye
+Comment[zh_CN]=窗口管理器
+Comment[zh_TW]=視窗管理程式
+Comment[zu]=Imenenja yama-Window ye
 
 [desktop1]
 Name=Change to Desktop 1
@@ -297,7 +297,7 @@ Name[pt]=Mudar para o Ecrã 2
 Name[pt_BR]=Mudar para a Área de Trabalho 2
 Name[ro]=Trece în ecranul 2
 Name[ru]=Перейти на рабочий стол 2
-Name[rw]=Hindura ku Biro 2 
+Name[rw]=Hindura ku Biro 2
 Name[se]=Mana nuppi čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 2
 Name[sl]=Preklopi na namizje 2
@@ -327,7 +327,7 @@ Comment[ar]=سطح المكتب الوهمي  رقم 2 هو المحدد
 Comment[az]=2. Masa üstü seçildi
 Comment[be]=Выбраны другі віртуальны працоўны стол
 Comment[bg]=Превключване на работен плот 2
-Comment[bn]=দ্বিতীয় ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে 
+Comment[bn]=দ্বিতীয় ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে
 Comment[br]=Burev galloudel Daou a zo diuzet
 Comment[bs]=Virtualna radna površina Dva je izabrana
 Comment[ca]=S'ha seleccionat l'escriptori virtual dos
@@ -454,7 +454,7 @@ Name[pt]=Mudar para o Ecrã 3
 Name[pt_BR]=Mudar para o Área de Trabalho 3
 Name[ro]=Trece în ecranul 3
 Name[ru]=Перейти на рабочий стол 3
-Name[rw]=Hindura ku Biro 3 
+Name[rw]=Hindura ku Biro 3
 Name[se]=Mana goalmmát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 3
 Name[sl]=Preklopi na namizje 3
@@ -611,7 +611,7 @@ Name[pt]=Mudar para o Ecrã 4
 Name[pt_BR]=Mudar para o Área de Trabalho 4
 Name[ro]=Trece în ecranul 4
 Name[ru]=Перейти на рабочий стол 4
-Name[rw]=Hindura ku Biro 4 
+Name[rw]=Hindura ku Biro 4
 Name[se]=Mana njeallját čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 4
 Name[sl]=Preklopi na namizje 4
@@ -768,7 +768,7 @@ Name[pt]=Mudar para o Ecrã 5
 Name[pt_BR]=Mudar para o Área de Trabalho 5
 Name[ro]=Trece în ecranul 5
 Name[ru]=Перейти на рабочий стол 5
-Name[rw]=Hindura ku Biro 5 
+Name[rw]=Hindura ku Biro 5
 Name[se]=Mana viđát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 5
 Name[sl]=Preklopi na namizje 5
@@ -925,7 +925,7 @@ Name[pt]=Mudar para o Ecrã 6
 Name[pt_BR]=Mudar para o Área de Trabalho 6
 Name[ro]=Trece în ecranul 6
 Name[ru]=Перейти на рабочий стол 6
-Name[rw]=Hindura ku Biro 6 
+Name[rw]=Hindura ku Biro 6
 Name[se]=Mana guđát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 6
 Name[sl]=Preklopi na namizje 6
@@ -955,7 +955,7 @@ Comment[ar]=سطح المكتب الوهمي  رقم 6 هو المحدد
 Comment[az]=6. Masa üstü seçildi
 Comment[be]=Выбраны шосты віртуальны працоўны стол
 Comment[bg]=Превключване на работен плот 6
-Comment[bn]=ষষ্ঠ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে 
+Comment[bn]=ষষ্ঠ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে
 Comment[br]=Burev galloudel C'hwec'h a zo diuzet
 Comment[bs]=Virtualna radna površina Šest je izabrana
 Comment[ca]=S'ha seleccionat l'escriptori virtual sis
@@ -1082,7 +1082,7 @@ Name[pt]=Mudar para o Ecrã 7
 Name[pt_BR]=Mudar para o Área de Trabalho 7
 Name[ro]=Trece în ecranul 7
 Name[ru]=Перейти на рабочий стол 7
-Name[rw]=Hindura ku Biro 7 
+Name[rw]=Hindura ku Biro 7
 Name[se]=Mana čihččet čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 7
 Name[sl]=Preklopi na namizje 7
@@ -1239,7 +1239,7 @@ Name[pt]=Mudar para o Ecrã 8
 Name[pt_BR]=Mudar para o Área de Trabalho 8
 Name[ro]=Trece în ecranul 8
 Name[ru]=Перейти на рабочий стол 8
-Name[rw]=Hindura ku Biro 8 
+Name[rw]=Hindura ku Biro 8
 Name[se]=Mana gávccát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 8
 Name[sl]=Preklopi na namizje 8
@@ -1269,7 +1269,7 @@ Comment[ar]=سطح المكتب الوهمي  رقم 8 هو المحدد
 Comment[az]=8. Masa üstü seçildi
 Comment[be]=Выбраны восьмы віртуальны працоўны стол
 Comment[bg]=Превключване на работен плот 8
-Comment[bn]=অষ্টম ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে 
+Comment[bn]=অষ্টম ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে
 Comment[br]=Burev galloudel Eizh a zo diuzet
 Comment[bs]=Virtualna radna površina Osam je izabrana
 Comment[ca]=S'ha seleccionat l'escriptori virtual vuit
@@ -1387,7 +1387,7 @@ Name[pt]=Mudar para o Ecrã 9
 Name[pt_BR]=Mudar para a Área de Trabalho 9
 Name[ro]=Trece în ecranul 9
 Name[ru]=Перейти на рабочий стол 9
-Name[rw]=Hindura ku Biro 9 
+Name[rw]=Hindura ku Biro 9
 Name[se]=Mana ovccát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 9
 Name[sl]=Preklopi na namizje 9
@@ -1423,7 +1423,7 @@ Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια ε�
 Comment[eo]=Tabulo naŭa estas elektita
 Comment[es]=Seleccionado el escritorio virtual Nueve
 Comment[et]=Üheksas virtuaalne töölaud on valitud
-Comment[eu]=Bederatzigarren mahaigain birtuala hautatua dago. 
+Comment[eu]=Bederatzigarren mahaigain birtuala hautatua dago.
 Comment[fa]=رومیزی مجازی نه انتخاب می‌شود
 Comment[fi]=Virtuaalityöpöytä yhdeksän on valittu
 Comment[fr]=Le bureau virtuel 9 est sélectionné
@@ -1508,7 +1508,7 @@ Name[it]=Va al desktop 10
 Name[ja]=デスクトップ 10 に移動
 Name[ka]=გადასვლა სამუშაო დაფაზე 10
 Name[kk]=10-үстелге ауысу
-Name[km]=ប្ដូរ​ទៅ​ផ្ទៃតុ ១០
+Name[km]=ប្ដូរ​ទៅ​ផ្ទៃតុ ១�
 Name[ko]=데스크톱 10으로 바꾸기
 Name[lt]=Pereiti į 10 darbastalį
 Name[mk]=Кон површина 10
@@ -1524,7 +1524,7 @@ Name[pt]=Mudar para o Ecrã 10
 Name[pt_BR]=Mudar para a Área de Trabalho 10
 Name[ro]=Trece în ecranul 10
 Name[ru]=Перейти на рабочий стол 10
-Name[rw]=Hindura ku Biro 10 
+Name[rw]=Hindura ku Biro 10
 Name[se]=Mana logát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 10
 Name[sl]=Preklopi na namizje 10
@@ -1800,7 +1800,7 @@ Name[pt]=Mudar para o Ecrã 12
 Name[pt_BR]=Mudar para a Área de Trabalho 12
 Name[ro]=Trece în ecranul 12
 Name[ru]=Перейти на рабочий стол 12
-Name[rw]=Hindura ku Biro 12 
+Name[rw]=Hindura ku Biro 12
 Name[se]=Mana guoktenuppelogát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 12
 Name[sl]=Preklopi na namizje 12
@@ -2075,7 +2075,7 @@ Name[pt]=Mudar para o Ecrã 14
 Name[pt_BR]=Mudar para o Área de Trabalho 14
 Name[ro]=Trece în ecranul 14
 Name[ru]=Перейти на рабочий стол 14
-Name[rw]=Hindura ku Biro 14 
+Name[rw]=Hindura ku Biro 14
 Name[se]=Mana njealljenuppelogát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 14
 Name[sl]=Preklopi na namizje 14
@@ -2133,7 +2133,7 @@ Comment[mk]=Избрана е виртуелната површина бр. 14
 Comment[ms]=Desktop maya empat belas dipilih
 Comment[nb]=Virtuelt skrivebord fjorten er valgt
 Comment[nds]=De virtuelle Schriefdisch Veerteihn is utsöcht
-Comment[ne]=अवास्तविक डेस्कटप १४ चयन गरिएको छ 
+Comment[ne]=अवास्तविक डेस्कटप १४ चयन गरिएको छ
 Comment[nl]=Virtueel bureaublad veertien is geselecteerd
 Comment[nn]=Virtuelt skrivebord fjorten vert valt
 Comment[pa]=ਫ਼ਰਜ਼ੀ ਵੇਹੜਾ ਚੌਦਾਂ ਚੁਣਿਆ
@@ -2213,7 +2213,7 @@ Name[pt]=Mudar para o Ecrã 15
 Name[pt_BR]=Mudar para o Área de Trabalho 15
 Name[ro]=Trece în ecranul 15
 Name[ru]=Перейти на рабочий стол 15
-Name[rw]=Hindura ku Biro 15 
+Name[rw]=Hindura ku Biro 15
 Name[se]=Mana vihttanuppelogát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 15
 Name[sl]=Preklopi na namizje 15
@@ -2627,7 +2627,7 @@ Name[pt]=Mudar para o Ecrã 18
 Name[pt_BR]=Mudar para o Área de Trabalho 18
 Name[ro]=Trece în ecranul 18
 Name[ru]=Перейти на рабочий стол 18
-Name[rw]=Hindura ku Biro 18 
+Name[rw]=Hindura ku Biro 18
 Name[se]=Mana gávccenuppelogát čállinbeavdái
 Name[sk]=Zmeniť na pracovnú plochu 18
 Name[sl]=Preklopi na namizje 18
@@ -2651,7 +2651,7 @@ Comment[af]=Virtuele Werkskerm agtien is gekies
 Comment[ar]=سطح المكتب الوهمي  رقم 18 هو المحدد
 Comment[be]=Выбраны васемнаццаты віртуальны працоўны стол
 Comment[bg]=Превключване на работен плот 18
-Comment[bn]=অষ্টাদশ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে 
+Comment[bn]=অষ্টাদশ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে
 Comment[br]=Burev galloudel triwec'h a zo dibabet
 Comment[bs]=Virtualna radna površina Osamnaest je izabrana
 Comment[ca]=S'ha seleccionat l'escriptori virtual divuit
@@ -2887,7 +2887,7 @@ Name[it]=Va al desktop 20
 Name[ja]=デスクトップ 20 に移動
 Name[ka]=გადასვლა სამუშაო დაფაზე 20
 Name[kk]=20-үстелге ауысу
-Name[km]=ផ្លាស់ប្តូរ​ទៅ​ផ្ទៃតុ ២០
+Name[km]=ផ្លាស់ប្តូរ​ទៅ​ផ្ទៃតុ ២�
 Name[ko]=데스크톱 20으로 바꾸기
 Name[lt]=Pereiti į 20 darbastalį
 Name[mk]=Кон површина 20
@@ -2927,7 +2927,7 @@ Comment[af]=Virtuele Werkskerm twintig is gekies
 Comment[ar]=سطح المكتب الوهمي  رقم 20 هو المحدد
 Comment[be]=Выбраны дваццаты віртуальны працоўны стол
 Comment[bg]=Превключване на работен плот 20
-Comment[bn]=বিংশ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে 
+Comment[bn]=বিংশ ভার্চুয়াল ডেস্কটপ নির্বাচিত হয়েছে
 Comment[br]=Burev galloudel warn-ugent a zo dibabet
 Comment[bs]=Virtualna radna površina Dvadeset je izabrana
 Comment[ca]=S'ha seleccionat l'escriptori virtual vint
@@ -3151,7 +3151,7 @@ Name[ar]=نافذة جديدة
 Name[az]=Yeni Pəncərə
 Name[be]=Новае акно
 Name[bg]=Нов прозорец
-Name[bn]=নতুন উইণ্ডো 
+Name[bn]=নতুন উইণ্ডো
 Name[br]=Prenestr nevez
 Name[bs]=Novi prozor
 Name[ca]=Finestra nova
@@ -3437,7 +3437,7 @@ Comment[pt]=Apagar a janela
 Comment[pt_BR]=Remover Janela
 Comment[ro]=Închide fereastra
 Comment[ru]=Удалить окно
-Comment[rw]=Gusiba idirishya 
+Comment[rw]=Gusiba idirishya
 Comment[se]=Sihko láse
 Comment[sk]=Odstrániť okno
 Comment[sl]=Zbriši okno
@@ -3516,7 +3516,7 @@ Name[pt]=Fechar a Janela
 Name[pt_BR]=Fechar Janela
 Name[ro]=Închide fereastra
 Name[ru]=Закрыть окно
-Name[rw]=Idirishya Gufunga 
+Name[rw]=Idirishya Gufunga
 Name[se]=Láse giddana
 Name[sk]=Zatvoriť okno
 Name[sl]=Zapri okno
@@ -4260,7 +4260,7 @@ Name[sk]=Maximalizovať okno
 Name[sl]=Razpni okno
 Name[sr]=Прозор се максимизује
 Name[sr@Latn]=Prozor se maksimizuje
-Name[ss]=Khulisa liwindi 
+Name[ss]=Khulisa liwindi
 Name[sv]=Fönster maximeras
 Name[ta]=சாளரத்தைப் பெரிதாக்கு
 Name[te]=విండొ పెద్దది చెయి
@@ -4329,7 +4329,7 @@ Comment[pt]=Uma janela é maximizada
 Comment[pt_BR]=Uma janela é maximizada
 Comment[ro]=O fereastră a fost maximizată
 Comment[ru]=Окно распахнуто на весь экран
-Comment[rw]=Idirishya rigizwe riri 
+Comment[rw]=Idirishya rigizwe riri
 Comment[se]=Láse maksimerejuvvo
 Comment[sk]=Okno je maximalizované
 Comment[sl]=Okno je razpeto
@@ -4481,7 +4481,7 @@ Comment[pt]=Uma janela deixa de estar maximizada
 Comment[pt_BR]=Uma janela perde a maximização
 Comment[ro]=O fereastră a pierdut maximizarea
 Comment[ru]=Окно более не распахнуто
-Comment[rw]=Idirishya ribuze ukugirwa riri 
+Comment[rw]=Idirishya ribuze ukugirwa riri
 Comment[se]=Láse ii šat maksimerejuvvon
 Comment[sk]=Okno nie je maximalizované
 Comment[sl]=Okno ni več razpeto
@@ -4861,7 +4861,7 @@ Name[uz@cyrillic]=Янги диалог
 Name[ven]=Nyambedzano ntswa
 Name[vi]=Mở hộp thoại mới
 Name[wa]=Novea purnea di kesse
-Name[xh]=Incoko yababini Entsha 
+Name[xh]=Incoko yababini Entsha
 Name[zh_CN]=新对话框
 Name[zh_TW]=新對話盒
 Name[zu]=Ingxoxo Entsha
@@ -5241,7 +5241,7 @@ Name[ar]=نهاية تحريك النافذة
 Name[az]=Pəncərə Daşıma Bitişi
 Name[be]=Скончыць рух акна
 Name[bg]=Край на преместване на прозорец
-Name[bn]=উইণ্ডো সরানো শেষ 
+Name[bn]=উইণ্ডো সরানো শেষ
 Name[br]=Echuiñ da zilec'hiañ ar prenestr
 Name[bs]=Kraj pomjeranja prozora
 Name[ca]=Fi de moviment de la finestra
@@ -5743,7 +5743,7 @@ Comment[af]='n Venseter op die huidige virtuele werkskerm het aandag nodig
 Comment[ar]=نافذة على سطح المكتب الوهمي الحالي تتطلّب الإنتباه
 Comment[be]=Акно на бягучым віртуальным працоўным стале прыцягвае ўвагу
 Comment[bg]=Прозорец на текущия работен плот изисква внимание
-Comment[bn]=বর্তমান ভার্চুয়াল ডেস্কটপে একটি উইণ্ডো আপনার দৃষ্টি আকর্ষণ করার চেষ্টা করছে 
+Comment[bn]=বর্তমান ভার্চুয়াল ডেস্কটপে একটি উইণ্ডো আপনার দৃষ্টি আকর্ষণ করার চেষ্টা করছে
 Comment[bs]=Prozor na trenutnoj radnoj površini zahtijeva pažnju
 Comment[ca]=Una finestra de l'escriptori virtual actual demana atenció
 Comment[cs]=Okno na aktuální virtuální ploše vyžaduje vaši pozornost
diff --git a/twin/kcmtwin/twinrules/detectwidgetbase.ui b/twin/kcmtwin/twinrules/detectwidgetbase.ui
index b13e7948a..28106a0b0 100644
--- a/twin/kcmtwin/twinrules/detectwidgetbase.ui
+++ b/twin/kcmtwin/twinrules/detectwidgetbase.ui
@@ -198,7 +198,7 @@
                         <string>Use &amp;whole window class (specific window)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
+                        <string>With some (non-TDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
                     </property>
                 </widget>
                 <widget class="TQCheckBox">
diff --git a/twin/main.cpp b/twin/main.cpp
index 1e1ec114c..7cdf8985c 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -60,7 +60,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
          )
         && (e->error_code == BadAccess)) 
         {
-        fputs(i18n("twin: it looks like there's already a window manager running. twin not started.\n").local8Bit(), stderr);
+        fputs(i18n("[twin] it looks like there's already a window manager running. twin not started.\n").local8Bit(), stderr);
         exit(1);
         }
 
@@ -71,11 +71,11 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
     sprintf(number, "%d", e->request_code);
     XGetErrorDatabaseText(d, "XRequest", number, "<unknown>", req, sizeof(req));
 
-    fprintf(stderr, "twin: %s(0x%lx): %s\n", req, e->resourceid, msg);
+    fprintf(stderr, "[twin] %s(0x%lx): %s\n", req, e->resourceid, msg);
 
     if (initting) 
         {
-        fputs(i18n("twin: failure during initialization; aborting").local8Bit(), stderr);
+        fputs(i18n("[twin] failure during initialization; aborting").local8Bit(), stderr);
         exit(1);
         }
     return 0;
@@ -129,19 +129,19 @@ Application::Application( )
                 XFree ( (void *) data);
                 if( !owner.claim( true, true ))
                     {
-                    fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
+                    fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
                     ::exit(1);
                     }
                 }
             else
                 {
-                fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
+                fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
                 ::exit(1);
                 }
             }
         else
             {
-            fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
+            fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
             ::exit(1);
             }
         }
@@ -299,9 +299,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
                 if (putenv( strdup(envir.data())) ) 
                     {
                     fprintf(stderr,
-                            "%s: WARNING: unable to set DISPLAY environment variable\n",
+                            "[twin] %s: WARNING: unable to set DISPLAY environment variable\n",
                             argv[0]);
-                    perror("putenv()");
+                    perror("[twin] putenv()");
                     }
                 }
             }