From adf473ac782486cbb808db19f4b8d49039ccd01e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 7 Dec 2011 18:53:12 -0600
Subject: [PATCH] Rename KDEHOME and KDEDIR

---
 INSTALL                         | 4 ++--
 cmake_admin/FindKDECONFIG.cmake | 2 +-
 cmake_admin/FindMEINPROC.cmake  | 2 +-
 doc/en/index.docbook            | 2 +-
 doc/es/index.docbook            | 2 +-
 doc/ja/index.docbook            | 2 +-
 doc/sv/index.docbook            | 2 +-
 po/ca/rosegarden.po             | 8 ++++----
 po/cs/rosegarden.po             | 8 ++++----
 po/cy/rosegarden.po             | 8 ++++----
 po/de/rosegarden.po             | 8 ++++----
 po/en/rosegarden.po             | 4 ++--
 po/en_GB/rosegarden.po          | 4 ++--
 po/es/rosegarden.po             | 8 ++++----
 po/et/rosegarden.po             | 4 ++--
 po/eu/rosegarden.po             | 8 ++++----
 po/fi/rosegarden.po             | 8 ++++----
 po/fr/rosegarden.po             | 8 ++++----
 po/it/rosegarden.po             | 8 ++++----
 po/ja/rosegarden.po             | 8 ++++----
 po/nl/rosegarden.po             | 8 ++++----
 po/pl/rosegarden.po             | 8 ++++----
 po/rosegarden.pot               | 4 ++--
 po/ru/rosegarden.po             | 8 ++++----
 po/sv/rosegarden.po             | 8 ++++----
 po/zh_CN/rosegarden.po          | 4 ++--
 src/gui/application/main.cpp    | 4 ++--
 src/gui/kdeext/klearlook.cpp    | 4 ++--
 28 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/INSTALL b/INSTALL
index 49f7823..71c493b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -68,10 +68,10 @@ By default, the install prefix will be /usr/local. If your KDE is
 installed at some other prefix, you probably want to override this
 setting, as suggested in "A Typical Build with CMake."  You may
 install to /usr/local or anywhere else, but if you do so, you must add
-that location to your KDEDIRS environment variable before running
+that location to your TDEDIRS environment variable before running
 Rosegarden.  For example:
 
-$ export KDEDIRS=/usr/local:$KDEDIRS
+$ export TDEDIRS=/usr/local:$TDEDIRS
 $ rosegarden
 
 Another option, useful for packagers, is setting DESTDIR at install
diff --git a/cmake_admin/FindKDECONFIG.cmake b/cmake_admin/FindKDECONFIG.cmake
index 5bce104..6688fa9 100644
--- a/cmake_admin/FindKDECONFIG.cmake
+++ b/cmake_admin/FindKDECONFIG.cmake
@@ -38,7 +38,7 @@ IF(KDECONFIG_EXECUTABLE)
     SET(HAVE_KDECONFIG TRUE)
 ELSE(KDECONFIG_EXECUTABLE)
     FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS
-        $ENV{KDEDIR}/bin
+        $ENV{TDEDIR}/bin
         /opt/trinity/bin
         /opt/kde/bin
         NO_DEFAULT_PATH
diff --git a/cmake_admin/FindMEINPROC.cmake b/cmake_admin/FindMEINPROC.cmake
index fb0892d..37e40a5 100644
--- a/cmake_admin/FindMEINPROC.cmake
+++ b/cmake_admin/FindMEINPROC.cmake
@@ -36,7 +36,7 @@ ELSE(MEINPROC_EXECUTABLE)
     FIND_PROGRAM(MEINPROC_EXECUTABLE
 	NAME meinproc 
 	PATHS ${KDE3_BIN_INSTALL_DIR}
-	 $ENV{KDEDIR}/bin
+	 $ENV{TDEDIR}/bin
 	 /usr/bin
 	 /usr/local/bin
 	 /opt/kde/bin
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 064dd2b..a98e2ad 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -6773,7 +6773,7 @@
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para>
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
index 3b15e0d..341c05f 100644
--- a/doc/es/index.docbook
+++ b/doc/es/index.docbook
@@ -6322,7 +6322,7 @@ Changing the Time Signature
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para
diff --git a/doc/ja/index.docbook b/doc/ja/index.docbook
index a1c09bf..4d2c660 100644
--- a/doc/ja/index.docbook
+++ b/doc/ja/index.docbook
@@ -5362,7 +5362,7 @@
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para>
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 066dcb0..cbc5469 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -6391,7 +6391,7 @@ Changing the Time Signature
     <!-- For URL links to common stuff like the one below,
     always use paths like "common/gpl-licence".
     In this path, "common" will be a symbolic link built at "make install" time.
-    This link will normally point to $KDEDIR/share/doc/HTML/en/common,
+    This link will normally point to $TDEDIR/share/doc/HTML/en/common,
     where "en" should be replaced with the current language. -->
 
     <para
diff --git a/po/ca/rosegarden.po b/po/ca/rosegarden.po
index ff5da9d..f730f81 100644
--- a/po/ca/rosegarden.po
+++ b/po/ca/rosegarden.po
@@ -4162,7 +4162,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Les versions incorrectes dels fitxers de dades del Rosegarden\n"
@@ -4180,7 +4180,7 @@ msgstr ""
 " 2. L'actualització s'ha instal·lat en una carpeta que no és habitual,\n"
 "     i una versió anterior s'ha trobat en la carpeta habitual.\n"
 "     Si és així, cal que afegiu la carpeta correcta a la variable\n"
-"     d'entorn KDEDIRS abans d'executar el programa."
+"     d'entorn TDEDIRS abans d'executar el programa."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -4203,7 +4203,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4219,7 +4219,7 @@ msgstr ""
 "     satisfactòriament.\n"
 "\n"
 " 2. El Rosegarden s'ha instal·lat en una carpeta que no és habitual,\n"
-"     i cal afegir aquesta carpeta a la variable d'entorn KDEDIRS\n"
+"     i cal afegir aquesta carpeta a la variable d'entorn TDEDIRS\n"
 "     abans d'executar el programa. Això pot ser degut a que l'heu\n"
 "     instal·lat en la carpeta $HOME o en una carpeta local\n"
 "     de paquets de tercers, com /usr/local o /opt."
diff --git a/po/cs/rosegarden.po b/po/cs/rosegarden.po
index e38ddae..3e20dcf 100644
--- a/po/cs/rosegarden.po
+++ b/po/cs/rosegarden.po
@@ -3940,7 +3940,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Ve standardních instalačních adresářích KDE byly nalezeny\n"
@@ -3956,7 +3956,7 @@ msgstr ""
 "\n"
 " 2. Vyšší verze byla nainstalovaná do nestandardního adresáře\n"
 "     a ve standardním adresáři byla nalezena verze stará.  Je-li tomu\n"
-"     tak, budete muset nejprve přidat správnou cestu do proměnné KDEDIRS\n"
+"     tak, budete muset nejprve přidat správnou cestu do proměnné TDEDIRS\n"
 "     předtím, než bude možné aplikaci spustit."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -3979,7 +3979,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -3994,7 +3994,7 @@ msgstr ""
 "     \"make install\" a zda tato procedura byla úspěšně dokončena.\n"
 "\n"
 " 2. Aplikace Rosegarden byla nainstalovaná do nestandardního adresáře\n"
-"     a budete muset nejprve přidat správnou cestu do proměnné KDEDIRS\n"
+"     a budete muset nejprve přidat správnou cestu do proměnné TDEDIRS\n"
 "     předtím, než bude možné aplikaci spustit.  To mohlo nastat, pokud\n"
 "     jste instalovali do adresáře $HOME nebo do místního adresáře, který\n"
 "     používá instalační balíček třetí strany např. /usr/local nebo /opt."
diff --git a/po/cy/rosegarden.po b/po/cy/rosegarden.po
index 0ab44b3..f3c895d 100644
--- a/po/cy/rosegarden.po
+++ b/po/cy/rosegarden.po
@@ -4136,7 +4136,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 "Canfuwyd y fersiynau anghywir o'r ffeiliau data Rosegarden\n"
@@ -4153,7 +4153,7 @@ msgstr ""
 "2. Gosodwyd y ddiweddariad mewn cyfeiriadur anarferol, \n"
 "    a chanfuwyd hen fersiwn mewn cyfeiriadur arferol.  Os felly, \n"
 "    bydd rhaid i chi ychwanegu'r cyfeiriadur cywir i'ch newidyn\n"
-"    amgylchedd KDEDIRS cyn i chi gael ei rhedeg."
+"    amgylchedd TDEDIRS cyn i chi gael ei rhedeg."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -4176,7 +4176,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4193,7 +4193,7 @@ msgstr ""
 "\n"
 "2. Mae Rosegarden wedi cael ei osod mewn cyfeiriadur anarferol, \n"
 "    a rhaid i chi ychwanegu'r cyfeiriadur yma i'ch newidyn\n"
-"    amgylchedd KDEDIRS cyn i chi gael ei rhedeg.  Gall hyn ddigwydd\n"
+"    amgylchedd TDEDIRS cyn i chi gael ei rhedeg.  Gall hyn ddigwydd\n"
 "    os rydych wedi gosod i mewn i $HOME neu cyfeiriadur pecyn\n"
 "    trydydd-blaid lleol fel /usr/local neu /opt."
 
diff --git a/po/de/rosegarden.po b/po/de/rosegarden.po
index 911e4f6..37d7dcf 100644
--- a/po/de/rosegarden.po
+++ b/po/de/rosegarden.po
@@ -3984,7 +3984,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Es wurden falsche Versionen der Rosegarden-Dateien\n"
@@ -4000,7 +4000,7 @@ msgstr ""
 "    und eine alte Version wurde im Standardverzeichnis gefunden.\n"
 "    In diesem Fall müssen Sie das korrekte Verzeichnis zur "
 "Umgebungsvariablen\n"
-"    KDEDIRS hinzufügen, damit Rosegarden funktioniert."
+"    TDEDIRS hinzufügen, damit Rosegarden funktioniert."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -4023,7 +4023,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4040,7 +4040,7 @@ msgstr ""
 "\n"
 " 2. Die neue Version wurde nicht im Standardverzeichnis installiert,\n"
 "    und Sie müssen das korrekte Verzeichnis zur Umgebungsvariablen\n"
-"    KDEDIRS hinzufügen, damit Rosegarden funktioniert. Dies könnte der Fall "
+"    TDEDIRS hinzufügen, damit Rosegarden funktioniert. Dies könnte der Fall "
 "sein,\n"
 "    wenn Sie nach $HOME oder in ein lokales Verzeichnis für "
 "Anwenderprogramme\n"
diff --git a/po/en/rosegarden.po b/po/en/rosegarden.po
index 8c5523a..41240a1 100644
--- a/po/en/rosegarden.po
+++ b/po/en/rosegarden.po
@@ -3818,7 +3818,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 
@@ -3842,7 +3842,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
diff --git a/po/en_GB/rosegarden.po b/po/en_GB/rosegarden.po
index 925a031..9d6fd77 100644
--- a/po/en_GB/rosegarden.po
+++ b/po/en_GB/rosegarden.po
@@ -3826,7 +3826,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 
@@ -3850,7 +3850,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
diff --git a/po/es/rosegarden.po b/po/es/rosegarden.po
index 810c8b0..838f968 100644
--- a/po/es/rosegarden.po
+++ b/po/es/rosegarden.po
@@ -3954,7 +3954,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Las versiones incorrectas de los archivos de datos de\n"
@@ -3973,7 +3973,7 @@ msgstr ""
 " 2. La actualización se ha instalado en un directorio no estándar,\n"
 "     y una versión anterior se ha encontrado en el directorio estándar.\n"
 "     Si es así, usted necesita añadir el directorio correcto a la variable\n"
-"     de entorno KDEDIRS antes de ejecutar el programa. "
+"     de entorno TDEDIRS antes de ejecutar el programa. "
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -3995,7 +3995,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4012,7 +4012,7 @@ msgstr ""
 "\n"
 " 2. Rosegarden ha sido instalado en un directorio no estándar,\n"
 "     y se necesita añadir este directorio a la variable de entorno\n"
-"     KDEDIRS antes de ejecutar el programa. Esto puede ser debido\n"
+"     TDEDIRS antes de ejecutar el programa. Esto puede ser debido\n"
 "     a la instalación en el directorio $HOME o en un directorio local\n"
 "     de paquetes de terceros, como /usr/local o /opt. "
 
diff --git a/po/et/rosegarden.po b/po/et/rosegarden.po
index 60ef0df..6e4d50d 100644
--- a/po/et/rosegarden.po
+++ b/po/et/rosegarden.po
@@ -4079,7 +4079,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 
@@ -4103,7 +4103,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
diff --git a/po/eu/rosegarden.po b/po/eu/rosegarden.po
index be24229..25d6c53 100644
--- a/po/eu/rosegarden.po
+++ b/po/eu/rosegarden.po
@@ -3998,7 +3998,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Las versiones incorrectas de los archivos de datos de\n"
@@ -4017,7 +4017,7 @@ msgstr ""
 " 2. La actualización se ha instalado en un directorio no estándar,\n"
 "     y una versión anterior se ha encontrado en el directorio estándar.\n"
 "     Si es así, usted necesita añadir el directorio correcto a la variable\n"
-"     de entorno KDEDIRS antes de ejecutar el programa. "
+"     de entorno TDEDIRS antes de ejecutar el programa. "
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -4040,7 +4040,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4054,7 +4054,7 @@ msgstr ""
 "     baduzu, egiaztatu \"scons install\" exekutatu duzula eta prozedura\n"
 "      modu egokian burutu dela\n"
 "\n"
-" 2. Rosegarden direktorio ezohiko batean instalatu da, eta KDEDIRS \n"
+" 2. Rosegarden direktorio ezohiko batean instalatu da, eta TDEDIRS \n"
 "     inguru-aldagaian sartu behar duzu exekutatu ahal izan baino lehenago\n"
 "     Hau izan daiteke arrazoia $HOME-n edo beste pakete lokal batean "
 "instalatu\n"
diff --git a/po/fi/rosegarden.po b/po/fi/rosegarden.po
index 0118aa6..1357276 100644
--- a/po/fi/rosegarden.po
+++ b/po/fi/rosegarden.po
@@ -3945,7 +3945,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Oletetusta KDE:n asennushakemmistosta löytyvät väärät \n"
@@ -3961,7 +3961,7 @@ msgstr ""
 "\n"
 " 2. Päivitystä ei asennettu oletushakemistoon,\n"
 "     ja vanha versio löytyi oletushakemistosta.  Mikäli näin on,\n"
-"     sinun täytyy lisätä oikea hakemisto KDEDIRS\n"
+"     sinun täytyy lisätä oikea hakemisto TDEDIRS\n"
 "     -ympäristömuuttujaan ennen kuin voit ajaa sen."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -3984,7 +3984,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -3999,7 +3999,7 @@ msgstr ""
 "     käskyn suoritus päättyi onnistuneesti.\n"
 "\n"
 " 2. Rosegardenia ei asennettu oletushakemistoon, \n"
-"     ja sinun täytyy lisätä tämä hakemisto KDEDIRS -ympäristömuutujaan\n"
+"     ja sinun täytyy lisätä tämä hakemisto TDEDIRS -ympäristömuutujaan\n"
 "     ennen kuin voit ajaa sen.  Näin saattaa olla, jos asennuspaikkana oli\n"
 "     $HOME tai paikallinen kolmannen osapuolen pakettihakemisto,\n"
 "     kuten /usr/local tai /opt."
diff --git a/po/fr/rosegarden.po b/po/fr/rosegarden.po
index 9d78f45..df4841a 100644
--- a/po/fr/rosegarden.po
+++ b/po/fr/rosegarden.po
@@ -3957,7 +3957,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Des versions incorrectes des fichiers auxiliaires \n"
@@ -3976,7 +3976,7 @@ msgstr ""
 "     standard, et une ancienne version a été trouvée dans\n"
 "     le répertoire standard. Si c'est le cas, vous devrez ajouter\n"
 "     le chemin de ce répertoire non standard dans la variable\n"
-"     d'environnement KDEDIRS avant de pouvoir exécuter Rosegarden."
+"     d'environnement TDEDIRS avant de pouvoir exécuter Rosegarden."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -3998,7 +3998,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4016,7 +4016,7 @@ msgstr ""
 "\n"
 " 2. Rosegarden a été installé dans un répertoire non standard,\n"
 "     et vous devez alors ajouter ce répertoire dans votre variable\n"
-"     d'environnement KDEDIRS. C'est peut-être le cas si vous\n"
+"     d'environnement TDEDIRS. C'est peut-être le cas si vous\n"
 "     avez effectué l'installation dans $HOME ou dans un répertoire\n"
 "     local pour applications tierces, comme /usr/local ou /opt."
 
diff --git a/po/it/rosegarden.po b/po/it/rosegarden.po
index 864e20f..8d4eae5 100644
--- a/po/it/rosegarden.po
+++ b/po/it/rosegarden.po
@@ -3934,7 +3934,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " Nelle directory standard di KDE sono state trovate\n"
@@ -3951,7 +3951,7 @@ msgstr ""
 " 2. L'aggiornamento è stato installato in una directory non standard,\n"
 "     e una versione precedente è stata trovata nella directory standard.\n"
 "     Se è così, devi aggiungere la directory giusta alla variabile di\n"
-"     sistema KDEDIRS prima di lanciare il programma."
+"     sistema TDEDIRS prima di lanciare il programma."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -3973,7 +3973,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -3988,7 +3988,7 @@ msgstr ""
 "     \"make install\" e che la procedura sia stata completata con successo.\n"
 "\n"
 " 2. Rosegarden è stato installato in una directory non standard,\n"
-"     e devi aggiungere questa directory alla variabile di sistema KDEDIRS\n"
+"     e devi aggiungere questa directory alla variabile di sistema TDEDIRS\n"
 "     prima di poter lanciare il programma. Questo può accadere\n"
 "     se hai fatto un'installazione in $HOME o in una directory locale\n"
 "     come /usr/local o /opt."
diff --git a/po/ja/rosegarden.po b/po/ja/rosegarden.po
index 295e740..0ae21fc 100644
--- a/po/ja/rosegarden.po
+++ b/po/ja/rosegarden.po
@@ -3917,7 +3917,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " 間違ったバージョンのRosegardenのデータファイルが標準KDE\n"
@@ -3933,7 +3933,7 @@ msgstr ""
 "\n"
 " 2. 非標準のディレクトリにアップデートがインストールされ、\n"
 "    標準のディレクトリに古いものが見付かった。もしもそうな\n"
-"    らば、実行する前に環境変数KDEDIRSに正しいディレクトリを\n"
+"    らば、実行する前に環境変数TDEDIRSに正しいディレクトリを\n"
 "    追加しなければならない。"
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -3956,7 +3956,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -3970,7 +3970,7 @@ msgstr ""
 "    完了したかを確認する。\n"
 "\n"
 " 2. 非標準のディレクトリにアップデートがインストールされ、\n"
-"    実行する前に環境変数KDEDIRSにこのディレクトリを追加する\n"
+"    実行する前に環境変数TDEDIRSにこのディレクトリを追加する\n"
 "    必要がある。これは、たとえば/usr/localや/optのようなサード\n"
 "    パーティ用ディレクトリか$HOMEにインストールする場合であろう。"
 
diff --git a/po/nl/rosegarden.po b/po/nl/rosegarden.po
index a9f16e7..28d6455 100644
--- a/po/nl/rosegarden.po
+++ b/po/nl/rosegarden.po
@@ -3948,7 +3948,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " In de standaard KDE-installatiemappen staan verkeerde\n"
@@ -3964,7 +3964,7 @@ msgstr ""
 "\n"
 " 2. De upgrade is in een non-standaard map geïnstalleerd, en er\n"
 "      is een oude versie gevonden in de standaardmap.  In dit geval\n"
-"      dient u de juiste map aan uw KDEDIRS omgevingsvariabele\n"
+"      dient u de juiste map aan uw TDEDIRS omgevingsvariabele\n"
 "      toevoegen voordat u deze kunt runnen."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -3987,7 +3987,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4002,7 +4002,7 @@ msgstr ""
 "     fouten is verlopen.\n"
 "\n"
 " 2. De upgrade is in een nonstandaard map geïnstalleerd,\n"
-"     en u moet deze map aan uw KDEDIRS omgevingsvariabele\n"
+"     en u moet deze map aan uw TDEDIRS omgevingsvariabele\n"
 "     toevoegen om het uit te kunnen voeren. Dit kan het geval zijn\n"
 "     als u heeft geïnstalleerd in $HOME of een lokale map voor pakketten\n"
 "     van derden, zoals /usr/local of /opt."
diff --git a/po/pl/rosegarden.po b/po/pl/rosegarden.po
index 552713c..d672b50 100644
--- a/po/pl/rosegarden.po
+++ b/po/pl/rosegarden.po
@@ -3995,7 +3995,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 "Dane złej wersji Różanego Ogrodu zostały znalezione\n"
@@ -4011,7 +4011,7 @@ msgstr ""
 "\n"
 "2. Aktualizacja została zainstalowana w nie standardowym katalogu,\n"
 "a stara wersja została znaleziona w standardowym katalogu. Jeśli tak, \n"
-"musisz dodać prawidłowy katalog do zmiennej środowiskowej KDEDIRS\n"
+"musisz dodać prawidłowy katalog do zmiennej środowiskowej TDEDIRS\n"
 " zanim będziesz mógł uruchomić program."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -4035,7 +4035,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4052,7 +4052,7 @@ msgstr ""
 "\n"
 "2. Aplikacja została zainstalowana w nie standardowym katalogu,\n"
 "a stara wersja została znaleziona w standardowym katalogu. Jeśli tak, \n"
-"musisz dodać prawidłowy katalog do zmiennej środowiskowej KDEDIRS\n"
+"musisz dodać prawidłowy katalog do zmiennej środowiskowej TDEDIRS\n"
 " zanim będziesz mógł uruchomić program. To może być przypadek, kiedy "
 "zainstalowałeś program do $HOME lub do lokalnego trzeciorzędnego katalogu\n"
 "jak /usr/local albo /opt."
diff --git a/po/rosegarden.pot b/po/rosegarden.pot
index f54243b..612a659 100644
--- a/po/rosegarden.pot
+++ b/po/rosegarden.pot
@@ -3818,7 +3818,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 
@@ -3842,7 +3842,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
diff --git a/po/ru/rosegarden.po b/po/ru/rosegarden.po
index 66b0e6b..ae2a2a9 100644
--- a/po/ru/rosegarden.po
+++ b/po/ru/rosegarden.po
@@ -3948,7 +3948,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 " В стандартных каталогах KDE для установки были найдены \n"
@@ -3964,7 +3964,7 @@ msgstr ""
 " 2. Обновлённые данные новой версии были записаны в каталог, \n"
 "     отличный от стандартного, и старые версии данных остались \n"
 "     в стандартном каталоге. В таком случае вам необходимо      указать "
-"правильные каталоги для переменной окружения KDEDIRS,\n"
+"правильные каталоги для переменной окружения TDEDIRS,\n"
 "     прежде чем снова попробовать запустить Rosegarden."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
@@ -3988,7 +3988,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4006,7 +4006,7 @@ msgstr ""
 "     от стандартного — например в $HOME или локальный каталог для      "
 "«неофициальных» пакетов — /usr/local или /opt. В таком случае вам\n"
 "     необходимо указать правильные каталоги для переменной окружения\n"
-"     KDEDIRS, прежде чем снова попробовать запустить Rosegarden."
+"     TDEDIRS, прежде чем снова попробовать запустить Rosegarden."
 
 #: ../src/gui/application/main.cpp:414
 msgid "Rosegarden"
diff --git a/po/sv/rosegarden.po b/po/sv/rosegarden.po
index 9bf64d6..5464c4b 100644
--- a/po/sv/rosegarden.po
+++ b/po/sv/rosegarden.po
@@ -3987,7 +3987,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 "Fel version av Rosegardens datafiler hittades\n"
@@ -4004,7 +4004,7 @@ msgstr ""
 "2. Uppgraderingen installerades i en annan än standardkatalogen,\n"
 "    och en gammal version hittades i en standardkatalog. Om det\n"
 "    är fallet, måste du lägga till den riktiga katalogen i miljövariabeln\n"
-"    KDEDIRS innan du kan köra den."
+"    TDEDIRS innan du kan köra den."
 
 #: ../src/gui/application/main.cpp:383 ../src/gui/application/main.cpp:401
 msgid "Installation problem"
@@ -4027,7 +4027,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
@@ -4041,7 +4041,7 @@ msgstr ""
 "     den själv, kontrollera att du har kört \"scons install\" och att\n"
 "     processen avslutades riktigt.\n"
 " 2. Rosegarden har installerats i en annan än standardkatalogen,\n"
-"     och du behöver lägga den katalogen till dina KDEDIRS-miljövariabler\n"
+"     och du behöver lägga den katalogen till dina TDEDIRS-miljövariabler\n"
 "     innan du kan köra programmet.  Detta kan vara fallet om du\n"
 "     installerade i HOME-katalogen eller en lokal katalog från tredje part\n"
 "     som exempelvis /usr/local eller /opt."
diff --git a/po/zh_CN/rosegarden.po b/po/zh_CN/rosegarden.po
index f0fbb67..b8a9ace 100644
--- a/po/zh_CN/rosegarden.po
+++ b/po/zh_CN/rosegarden.po
@@ -4047,7 +4047,7 @@ msgid ""
 "\n"
 " 2. The upgrade was installed in a non-standard directory,\n"
 "     and an old version was found in a standard directory.  If so,\n"
-"     you will need to add the correct directory to your KDEDIRS\n"
+"     you will need to add the correct directory to your TDEDIRS\n"
 "     environment variable before you can run it."
 msgstr ""
 
@@ -4071,7 +4071,7 @@ msgid ""
 "     the procedure completed successfully.\n"
 "\n"
 " 2. Rosegarden has been installed in a non-standard directory,\n"
-"     and you need to add this directory to your KDEDIRS environment\n"
+"     and you need to add this directory to your TDEDIRS environment\n"
 "     variable before you can run it.  This may be the case if you\n"
 "     installed into $HOME or a local third-party package directory\n"
 "     like /usr/local or /opt."
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 8d771d2..ff03584 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -378,7 +378,7 @@ void testInstalledVersion()
               "     successfully.\n\n"
               " 2. The upgrade was installed in a non-standard directory,\n"
               "     and an old version was found in a standard directory.  If so,\n"
-              "     you will need to add the correct directory to your KDEDIRS\n"
+              "     you will need to add the correct directory to your TDEDIRS\n"
               "     environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion),
          i18n("Installation problem"));
 
@@ -394,7 +394,7 @@ void testInstalledVersion()
               "     it yourself, check that you have run \"make install\" and that\n"
               "     the procedure completed successfully.\n\n"
               " 2. Rosegarden has been installed in a non-standard directory,\n"
-              "     and you need to add this directory to your KDEDIRS environment\n"
+              "     and you need to add this directory to your TDEDIRS environment\n"
               "     variable before you can run it.  This may be the case if you\n"
               "     installed into $HOME or a local third-party package directory\n"
               "     like /usr/local or /opt."),
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 3a4af04..0a2a1d2 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -103,7 +103,7 @@ static const int arrowHMargin = 6;
 static const int rightBorder = 12;
 
 #if TDE_VERSION >= 0x30200 
-// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
+// Try to read $TDEHOME/share/config/kickerrc to find out if kicker is transparent...
 
 static TQString readEnvPath( const char *env ) {
     TQCString path = getenv( env );
@@ -114,7 +114,7 @@ static TQString readEnvPath( const char *env ) {
 }
 
 static bool kickerIsTrans() {
-    TQString kdeHome( readEnvPath( getuid() ? "KDEHOME" : "KDEROOTHOME" ) ),
+    TQString kdeHome( readEnvPath( getuid() ? "TDEHOME" : "KDEROOTHOME" ) ),
     cfgFileName;
     bool trans = false;