diff --git a/acinclude.m4 b/acinclude.m4
index c741ac4..29e9d1f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -382,13 +382,13 @@ same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -1794,7 +1794,7 @@ fi
 if test -z "$1"; then
 
 kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1806,7 +1806,7 @@ So, check this please and use another prefix!])
 fi
 
 kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -3550,7 +3550,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4947,12 +4947,12 @@ AC_DEFUN([KDE_CONF_FILES],
 
 dnl This sets the prefix, for arts and tdelibs
 dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -4976,7 +4976,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
diff --git a/configure.in b/configure.in
index 56e858d..2cd6dbb 100644
--- a/configure.in
+++ b/configure.in
@@ -86,7 +86,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp
index 666abb6..23d1eca 100644
--- a/kbarcode/definition.cpp
+++ b/kbarcode/definition.cpp
@@ -545,7 +545,7 @@ bool Definition::showFileError()
     if( nodefmsg ) {
         KMessageBox::information( 0,
             i18n("KBarcode is unable to find its label definitions."
-                 "Please make sure that the file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql "
+                 "Please make sure that the file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql "
                  "does exist. This file is part of the KBarcode distribution. "
                  "You will be prompted now to select the file containing the labeldefinitions."),
                  "", "NoDefinitionsFound" );
diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp
index ed962d3..7f0c7fc 100644
--- a/kbarcode/main.cpp
+++ b/kbarcode/main.cpp
@@ -53,7 +53,7 @@ static KCmdLineOptions options[] =
 void setupDirs()
 {
     if( locate("data", "kbarcode/logo.png").isEmpty() ) {
-        // Maybe KBarcode was not installed into $KDEDIR
+        // Maybe KBarcode was not installed into $TDEDIR
         KStandardDirs* dirs = KGlobal::dirs();
         TQString kdedir = dirs->kfsstnd_prefixes();
 
diff --git a/po/de.po b/po/de.po
index bb4b4b1..efa7d86 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1029,12 +1029,12 @@ msgstr "&CSV Datei importieren..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode kann die Label Definitionen nicht finden. Bitte stellen Sie sicher, "
-"dass die Datei $KDEDIR/share/apps/kbarcode/labeldefinitions.sql existiert. "
+"dass die Datei $TDEDIR/share/apps/kbarcode/labeldefinitions.sql existiert. "
 "Diese Datei ist Teil der KBarcode Distribution. Sie werden jetzt nach einer "
 "Datei gefragt die die Label Definitionen enthält."
 
diff --git a/po/el.po b/po/el.po
index 664def3..8f6b3e8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1072,12 +1072,12 @@ msgstr "&Εισαγωγή Αρχείου CVS..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "Το KBarcode δεν κατάφερε να εντοπίσει τους ορισμούς ταμπέλων του. Παρακαλώ "
-"σιγουρευτείτε ότι το αρχείο $KDEDIR/share/apps/kbarcode/labeldefinitions.sql "
+"σιγουρευτείτε ότι το αρχείο $TDEDIR/share/apps/kbarcode/labeldefinitions.sql "
 "υπάρχει. Αυτό το αρχείο είναι μέρος του KBarcode. Θα σας ζητηθεί τώρα να "
 "επιλέξετε το αρχείο που περιέχει τους ορισμούς των ταμπέλων."
 
diff --git a/po/es.po b/po/es.po
index a7a266e..b06eb58 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1092,12 +1092,12 @@ msgstr "&Importar archivo CSV..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode no encuentra las definiciones de las etiquetas. Por favor, "
-"asegúrese de que el archivo $KDEDIR/share/apps/kbarcode/labeldefinitions.sql "
+"asegúrese de que el archivo $TDEDIR/share/apps/kbarcode/labeldefinitions.sql "
 "existe. Este archivo es parte de la distribución de KBarcode. Ahora se le "
 "pedirá que seleccione el archivo que contiene las definiciones de las "
 "etiquetas."
diff --git a/po/fi.po b/po/fi.po
index b122d67..16b9b98 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1088,12 +1088,12 @@ msgstr "&Tuo CSV tiedosto..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode ei kykene löytämään etikettimääritelmiään. Ole hyvä ja varmista, "
-"että $KDEDIR/share/apps/kbarcode/labeldefinitions.sql on olemassa. Tämä "
+"että $TDEDIR/share/apps/kbarcode/labeldefinitions.sql on olemassa. Tämä "
 "tiedosto kuuluu KBarcode-pakettiin. Sinua pyydetään erikseen valitsemaan "
 "tiedoston joka sisältää tarvittavat määritelmät."
 
diff --git a/po/fr.po b/po/fr.po
index df603b8..1904571 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1109,12 +1109,12 @@ msgstr "&Importer le fichier du CVS..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode ne peut trouver ses definitions d'étiquettes.Veuillez vous assurer  "
-"que le fichier $KDEDIR/share/apps/kbarcode/labeldefinitions.sql existe bien. "
+"que le fichier $TDEDIR/share/apps/kbarcode/labeldefinitions.sql existe bien. "
 "Ce fichier fait partie de KBarCode. Sélectionnez maintenant le fichier contenant les définitions d'étiquettes."
 
 #: definitiondialog.cpp:82
diff --git a/po/hu.po b/po/hu.po
index d9863d8..4f4d753 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1087,12 +1087,12 @@ msgstr "CSV file &importálása..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "A KBarcode nem találja a címkedefinícióit. Kérlek bizonyosodj meg róla, hogy "
-"a $KDEDIR/share/apps/kbarcode/labeldefinitions.sql létezik. Ez a file "
+"a $TDEDIR/share/apps/kbarcode/labeldefinitions.sql létezik. Ez a file "
 "megtalálható a KBarcode disztribúcióban. A következőkben meg kell adnod a "
 "címkedefiníciókat tartalmazó filet."
 
diff --git a/po/it.po b/po/it.po
index 01db261..e1230c2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1090,12 +1090,12 @@ msgstr "&Importa file CSV..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode non riesce a trovare le proprie definizioni di etichetta. Per "
-"piacere, assicurati che il file $KDEDIR/share/apps/kbarcode/labeldefinitions."
+"piacere, assicurati che il file $TDEDIR/share/apps/kbarcode/labeldefinitions."
 "sql esista. Questo file è parte della distribuzione di KBarcode. Ti sarà "
 "offerta la possibilità di selezionare ora il file contenente le definizioni "
 "di etichetta."
diff --git a/po/nl.po b/po/nl.po
index b26760c..bf5aaf0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1081,12 +1081,12 @@ msgstr "&CSV Bestand Importeren..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode is niet in staat om label definities te vinden. Zorg er a.u.b. voor "
-"dat het bestand $KDEDIR/share/apps/kbarcode/labeldefinitions.sql bestaat. "
+"dat het bestand $TDEDIR/share/apps/kbarcode/labeldefinitions.sql bestaat. "
 "Dit bestand is onderdeel van de KBarcode distributie. U zal gevraagd worden "
 "naar het bestand dat de labeldefinities bevat."
 
diff --git a/po/pl.po b/po/pl.po
index 2b8dd34..029e611 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1083,11 +1083,11 @@ msgstr "&Importuj plik CVS"
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
-"KBarcode nie może odnaleźć definicji etykiet. Upewnij się, że plik $KDEDIR/"
+"KBarcode nie może odnaleźć definicji etykiet. Upewnij się, że plik $TDEDIR/"
 "share/apps/kbarcode/labeldefinitions.sql rzeczywiście istnieje. Plik ten "
 "jest częścią dystrybucji KBarcode. Za chwilę ukaże się okno wyboru pliku "
 "zawierającego definicje."
diff --git a/po/sv.po b/po/sv.po
index a9b0d14..f9b55d2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1106,12 +1106,12 @@ msgstr "&Importera uppgifter och skriv ut som batchkörning"
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
 "KBarcode kan inte hitta sina etikettdefinitioner. Försäkra dig om att filen "
-"$KDEDIR/share/apps/kbarcode/labeldefinitions.sql existerar. Filen är en del "
+"$TDEDIR/share/apps/kbarcode/labeldefinitions.sql existerar. Filen är en del "
 "av KBarcode-distributionen. Du kommer att bli tillfrågad efter filen som "
 "innehåller dessa etikettdefinitioner."
 
diff --git a/po/tr.po b/po/tr.po
index d4cf21b..2acf5cf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1028,11 +1028,11 @@ msgstr "&CSV Dosyasını İçe Aktar..."
 #: definition.cpp:547
 msgid ""
 "KBarcode is unable to find its label definitions.Please make sure that the "
-"file $KDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
+"file $TDEDIR/share/apps/kbarcode/labeldefinitions.sql does exist. This file "
 "is part of the KBarcode distribution. You will be prompted now to select the "
 "file containing the labeldefinitions."
 msgstr ""
-"KBarcode etiket tanımlamalarını bulamadı. Lütfen $KDEDIR/share/apps/kbarcode/"
+"KBarcode etiket tanımlamalarını bulamadı. Lütfen $TDEDIR/share/apps/kbarcode/"
 "labeldefinitions.sql dosyasının bulunduğundan emin olun. Bu dosya, KBarcode "
 "dağıtımının bir parçasıdır. Şimdi etiket tanımlamalarını içeren dosyayı "
 "seçmek için uyarılacaksınız."