13 files changed, 46 insertions, 46 deletions
diff --git a/tde-i18n-ms/acinclude.m4 b/tde-i18n-ms/acinclude.m4
index 7d9fdee4132..bf9647ca6d6 100644
--- a/tde-i18n-ms/acinclude.m4
+++ b/tde-i18n-ms/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/kde3/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/kde3/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=""
@@ -1818,7 +1818,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/kde3/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"
@@ -1830,7 +1830,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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/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"
@@ -3574,7 +3574,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
@@ -4973,12 +4973,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
@@ -5002,7 +5002,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/tde-i18n-ms/configure b/tde-i18n-ms/configure
index a532889cc41..bc5046caa9c 100755
--- a/tde-i18n-ms/configure
+++ b/tde-i18n-ms/configure
@@ -577,7 +577,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="messages/Makefile.am"
-ac_default_prefix=${KDEDIR:-the kde prefix}
+ac_default_prefix=${TDEDIR:-the kde prefix}
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -2623,13 +2623,13 @@ For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
 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
 
 
@@ -2925,13 +2925,13 @@ For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
 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
 
 
@@ -3038,11 +3038,11 @@ _ACEOF
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/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
@@ -3690,7 +3690,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
 
 KDE_XSL_STYLESHEET=NO
 for i in $kde_sharedirs;
@@ -3738,11 +3738,11 @@ done
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/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
@@ -5431,7 +5431,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/tde-i18n-ms/configure.in b/tde-i18n-ms/configure.in
index 96d0782f21a..0a9610859da 100644
--- a/tde-i18n-ms/configure.in
+++ b/tde-i18n-ms/configure.in
@@ -44,7 +44,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/tde-i18n-ms/messages/tdebase/kcmfonts.po b/tde-i18n-ms/messages/tdebase/kcmfonts.po
index 8bd3335db28..04ce8ac348a 100644
--- a/tde-i18n-ms/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-ms/messages/tdebase/kcmfonts.po
@@ -183,7 +183,7 @@ msgid ""
 "<p>The use of this option is generally discouraged. For selecting proper DPI "
 "value a better option is explicitly configuring it for the whole X server if "
 "possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> "
-"to ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not "
+"to ServerLocalArgs= in $TDEDIR/share/config/kdm/kdmrc). When fonts do not "
 "render properly with real DPI value better fonts should be used or "
 "configuration of font hinting should be checked.</p>"
 msgstr ""
diff --git a/tde-i18n-ms/messages/tdebase/kcmkicker.po b/tde-i18n-ms/messages/tdebase/kcmkicker.po
index 9a312423c70..ae95b0e9a19 100644
--- a/tde-i18n-ms/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-ms/messages/tdebase/kcmkicker.po
@@ -1091,7 +1091,7 @@ msgid ""
 "                                    "
 "<p><b>Tip</b>: 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 $KDEHOME/share/apps/kicker/pics.</qt>"
+"kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt>"
 msgstr ""
 "<qt>Apabila opsyen ini dipilih, suatu imej akan muncul di sebelah kiri bawah "
 "Menu K. Imej ini akan diseriwarnakan menurut seting warna anda.\n"
@@ -1099,7 +1099,7 @@ msgstr ""
 "                                    "
 "<p><b>Tip</b>: Anda boleh suaikan imej yang muncul dalam Menu K dengan "
 "meletakkan fail imej yang dinamai kside_tile.png dalam "
-"$KDEHOME/share/apps/kicker/pics.</qt>"
+"$TDEHOME/share/apps/kicker/pics.</qt>"
 
 #. i18n: file menutab.ui line 151
 #: rc.cpp:410
diff --git a/tde-i18n-ms/messages/tdeedu/khangman.po b/tde-i18n-ms/messages/tdeedu/khangman.po
index d5d8b4ee928..773aed27f21 100644
--- a/tde-i18n-ms/messages/tdeedu/khangman.po
+++ b/tde-i18n-ms/messages/tdeedu/khangman.po
@@ -72,7 +72,7 @@ msgstr "Huruf ini telah diteka."
 
 #: khangmanview.cpp:594
 msgid ""
-"File $KDEDIR/share/apps/khangman/data/%1/%2 not found!\n"
+"File $TDEDIR/share/apps/khangman/data/%1/%2 not found!\n"
 "Check your installation, please!"
 msgstr ""
 
@@ -516,10 +516,10 @@ msgstr "Bahasa"
 
 #: khangman.cpp:437
 msgid ""
-"File $KDEDIR/share/apps/khangman/%1.txt not found;\n"
+"File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
 "check your installation."
 msgstr ""
-"Fail $KDEDIR/share/apps/khangman/%1.txt tidak dijumpai;\n"
+"Fail $TDEDIR/share/apps/khangman/%1.txt tidak dijumpai;\n"
 "periksa pemasangan anda."
 
 #: khangman.cpp:460
diff --git a/tde-i18n-ms/messages/tdeedu/klettres.po b/tde-i18n-ms/messages/tdeedu/klettres.po
index e1343d6158d..1df8a75c0b6 100644
--- a/tde-i18n-ms/messages/tdeedu/klettres.po
+++ b/tde-i18n-ms/messages/tdeedu/klettres.po
@@ -38,7 +38,7 @@ msgstr "Luganda"
 #, fuzzy
 msgid ""
 "The file sounds.xml was not found in\n"
-"$KDEDIR/share/apps/klettres/\n"
+"$TDEDIR/share/apps/klettres/\n"
 "\n"
 "Please install this file and start KLettres again.\n"
 "\n"
@@ -222,10 +222,10 @@ msgstr "Tukar ke mod Dewasa"
 
 #: klettres.cpp:461
 msgid ""
-"File $KDEDIR/share/apps/klettres/%1.txt not found;\n"
+"File $TDEDIR/share/apps/klettres/%1.txt not found;\n"
 "please check your installation."
 msgstr ""
-"Fail $KDEDIR/share/apps/klettres/%1.txt tidak dijumpai;\n"
+"Fail $TDEDIR/share/apps/klettres/%1.txt tidak dijumpai;\n"
 "sila periksa pemasangan anda."
 
 #: klettres.cpp:478
diff --git a/tde-i18n-ms/messages/tdeedu/kstars.po b/tde-i18n-ms/messages/tdeedu/kstars.po
index d8cc7cd28e9..802b2e737dd 100644
--- a/tde-i18n-ms/messages/tdeedu/kstars.po
+++ b/tde-i18n-ms/messages/tdeedu/kstars.po
@@ -1054,7 +1054,7 @@ msgid ""
 "Unable to find device driver file 'drivers.xml'. Please locate the file and "
 "place it in one of the following locations:\n"
 "\n"
-" \t$(KDEDIR)/share/apps/kstars/%1 \n"
+" \t$(TDEDIR)/share/apps/kstars/%1 \n"
 "\t~/.kde/share/apps/kstars/%1"
 msgstr ""
 "hingga fail fail dan inci bagi\n"
diff --git a/tde-i18n-ms/messages/tdesdk/kbabel.po b/tde-i18n-ms/messages/tdesdk/kbabel.po
index 38f0f534de6..ef1c000d72d 100644
--- a/tde-i18n-ms/messages/tdesdk/kbabel.po
+++ b/tde-i18n-ms/messages/tdesdk/kbabel.po
@@ -5622,7 +5622,7 @@ msgid ""
 "<br/>If you choose the old version, the new one will be removed. If you choose "
 "the new version, the old database files will be left alone and you need to "
 "remove them manually. Otherwise this message will be displayed again (the old "
-"files are at $KDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
+"files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
 msgstr ""
 
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
diff --git a/tde-i18n-ms/messages/tdeutils/ksim.po b/tde-i18n-ms/messages/tdeutils/ksim.po
index 184ce8082d6..26770a1cae2 100644
--- a/tde-i18n-ms/messages/tdeutils/ksim.po
+++ b/tde-i18n-ms/messages/tdeutils/ksim.po
@@ -40,10 +40,10 @@ msgstr ""
 #: library/pluginloader.cpp:99
 msgid ""
 "KSim was unable to load the plugin %1 due to not being able to find the plugin, "
-"check that the plugin is installed and is in your $KDEDIR/lib path"
+"check that the plugin is installed and is in your $TDEDIR/lib path"
 msgstr ""
 "KSim tidak dapat memuatkan plugin %1 kerana tidak dapat mencari plugin, "
-"pastikan plugin dipasang dan adalah dalam laluan $KDEDIR/lib anda"
+"pastikan plugin dipasang dan adalah dalam laluan $TDEDIR/lib anda"
 
 #: library/pluginloader.cpp:105
 msgid ""
diff --git a/tde-i18n-ms/messages/tdevelop/tdevelop.po b/tde-i18n-ms/messages/tdevelop/tdevelop.po
index 243dac98ff5..cd176491a5a 100644
--- a/tde-i18n-ms/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-ms/messages/tdevelop/tdevelop.po
@@ -7672,7 +7672,7 @@ msgstr ""
 msgid ""
 "<b>NOTE</b> These are directories to search in that are found in your KDE "
 "resource directories.  So if you add the string \"kate/scripts\" to the list "
-"then KScript will look in \"$KDEDIRS/data/kate/scripts\" for scripts.  This "
+"then KScript will look in \"$TDEDIRS/data/kate/scripts\" for scripts.  This "
 "will allow you to get scripts in your home directory as well as system wide "
 "ones."
 msgstr ""
@@ -18889,9 +18889,9 @@ msgid ""
 "Unable to find plugins, KDevelop will not work properly.\n"
 "Please make sure that KDevelop is installed in your KDE directory; otherwise, "
 "you have to add KDevelop's installation path to the environment variable "
-"KDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
+"TDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
 "Example for BASH users:\n"
-"export KDEDIRS=/path/to/tdevelop:$KDEDIRS && kbuildsycoca"
+"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && kbuildsycoca"
 msgstr ""
 
 #: src/simplemainwindow.cpp:105
diff --git a/tde-i18n-ms/messages/tdewebdev/klinkstatus.po b/tde-i18n-ms/messages/tdewebdev/klinkstatus.po
index 570d963eab7..d8a18d0bc99 100644
--- a/tde-i18n-ms/messages/tdewebdev/klinkstatus.po
+++ b/tde-i18n-ms/messages/tdewebdev/klinkstatus.po
@@ -197,7 +197,7 @@ msgstr ""
 
 #: klinkstatus.cpp:75
 msgid ""
-"Could not find the KLinkStatus part; did you configure with '--prefix=/$KDEDIR' "
+"Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' "
 "and perform 'make install'?"
 msgstr ""
 
diff --git a/tde-i18n-ms/messages/tdewebdev/quanta.po b/tde-i18n-ms/messages/tdewebdev/quanta.po
index 42cdec8bf8e..8b4224afded 100644
--- a/tde-i18n-ms/messages/tdewebdev/quanta.po
+++ b/tde-i18n-ms/messages/tdewebdev/quanta.po
@@ -1629,7 +1629,7 @@ msgstr ""
 msgid ""
 "The name of the folder where the toolbars are stored. This is a relative name "
 "to "
-"<br><i>$KDEDIR(&nbsp;or&nbsp;$KDEHOME)/share/apps/quanta/toolbars</i> ."
+"<br><i>$TDEDIR(&nbsp;or&nbsp;$TDEHOME)/share/apps/quanta/toolbars</i> ."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 320
@@ -9430,7 +9430,7 @@ msgstr ""
 
 #: src/quanta.cpp:227
 msgid ""
-"You may have forgotten to run \"make install\", or your KDEDIR, KDEDIRS or PATH "
+"You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH "
 "are not set correctly."
 msgstr ""