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

22 files changed, 161 insertions, 161 deletions

diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo
index cd02cce66..09531b7d7 100644
--- a/tdecore/README.kstartupinfo
+++ b/tdecore/README.kstartupinfo
@@ -134,7 +134,7 @@ Implementation details :
 ------------------------
 
  The ASN info data is sent using X ClientMessages as text ( see below ),
-this is mainly in hope also non-KDE people will start using it, and
+this is mainly in hope also non-TDE people will start using it, and
 they wouldn't be very happy with DCOP.
  Before starting an application, and environment variable called
 KDE_STARTUP_ENV is added to it's environment, and it's set to unique
@@ -271,7 +271,7 @@ Entries :
  Well, I guess that's all. The KDE2.2 release will show if the users like it
 or not ( it's quite good IMHO, even though there are probably some minor
 details to fix or improve ). The only big thing remaining is to make also
-non-KDE people agree on using something like this. My first attempt
+non-TDE people agree on using something like this. My first attempt
 https://listman.redhat.com/pipermail/xdg-list/2001-May/000083.html
 didn't get much attention, but now that there's a working implementation,
 I hope it will get better, when I try again sometime in the future.
diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index ce957c92b..d7ef1cd08 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -7,7 +7,7 @@ if test "$exec_prefix" = "NONE"; then
 else
     bindir_str="\"$exec_prefix/bin\""
 fi
-AC_DEFINE_UNQUOTED(__KDE_BINDIR, $bindir_str, [KDE bindir])
+AC_DEFINE_UNQUOTED(__TDE_BINDIR, $bindir_str, [TDE bindir])
 
 dnl tests for openpty support
 AC_MSG_CHECKING(whether we can use openpty)
diff --git a/tdecore/eventsrc b/tdecore/eventsrc
index ffc6feb98..fdef425b2 100644
--- a/tdecore/eventsrc
+++ b/tdecore/eventsrc
@@ -1,90 +1,90 @@
 [!Global!]
 IconName=kmenu
-Comment=KDE System Notifications
-Comment[af]=KDE Stelsel Inkennistelling
+Comment=System Notifications
+Comment[af]=Stelsel Inkennistelling
 Comment[ar]=تنبيهات كيدي
-Comment[az]=KDE Sistem Bildirişləri
-Comment[be]=Сістэмныя нагадванні KDE
+Comment[az]=Sistem Bildirişləri
+Comment[be]=Сістэмныя нагадванні
 Comment[bg]=Системни съобщения
 Comment[bn]=কে.ডি.ই সিস্টেম বার্তাবলী
-Comment[br]=Kemennoù ar reizhiad KDE
-Comment[bs]=KDE Sistemska obavještenja
-Comment[ca]=Notificacions del sistema KDE
-Comment[cs]=Systémová hlášení prostředí KDE
-Comment[csb]=Systemòwé òdkôzanié w KDE
-Comment[cy]=Hysbysiadau Cysawd KDE
-Comment[da]=KDE-systembekendtgørelser
-Comment[de]=KDE-Systemnachrichten
-Comment[el]=Ειδοποιήσεις συστήματος του KDE
-Comment[eo]=KDE-Sistematentigoj
-Comment[es]=Notificaciones del sistema de KDE
-Comment[et]=KDE süsteemi märguanded
-Comment[eu]=KDEren sistemako jakinarazpenak
-Comment[fa]=اخطارهای سیستم KDE
-Comment[fi]=KDE:n järjestelmähuomautukset
-Comment[fr]=Notifications du système KDE
-Comment[fy]=KDE Systeemberjochten
-Comment[ga]=Fógairt Chórais KDE
-Comment[gl]=Notificacións do Sistema de KDE
-Comment[he]=הודעות מערכת של KDE
+Comment[br]=Kemennoù ar reizhiad
+Comment[bs]=Sistemska obavještenja
+Comment[ca]=Notificacions del sistema
+Comment[cs]=Systémová hlášení prostředí
+Comment[csb]=Systemòwé òdkôzanié w
+Comment[cy]=Hysbysiadau Cysawd
+Comment[da]=systembekendtgørelser
+Comment[de]=Systemnachrichten
+Comment[el]=Ειδοποιήσεις συστήματος του
+Comment[eo]=Sistematentigoj
+Comment[es]=Notificaciones del sistema de
+Comment[et]=süsteemi märguanded
+Comment[eu]=ren sistemako jakinarazpenak
+Comment[fa]=اخطارهای سیستم
+Comment[fi]=järjestelmähuomautukset
+Comment[fr]=Notifications du système
+Comment[fy]=Systeemberjochten
+Comment[ga]=Fógairt Chórais
+Comment[gl]=Notificacións do Sistema de
+Comment[he]=הודעות מערכת של
 Comment[hi]=केडीई तंत्र सूचना
-Comment[hr]=KDE sistemske obavijesti
-Comment[hsb]=KDE systemowe powěsće
-Comment[hu]=KDE rendszerüzenetek
-Comment[id]=Sistem Pemberitahuan KDE
-Comment[is]=Tilkynningar KDE kerfisins
-Comment[it]=Avvisi di sistema di KDE
-Comment[ja]=KDE システム通知
-Comment[ka]=KDE სისტემური შეტყობინებები
-Comment[kk]=KDE жүйе құлақтандырулар
-Comment[km]=ការ​ជូន​ដំណឹង​អំពី​ប្រព័ន្ធ​របស់ KDE
-Comment[ko]=KDE 시스템 알림
-Comment[lb]=KDE-System-Norichten
-Comment[lt]=KDE Sistemos Pranešimai
-Comment[lv]=KDE Sistēmas Paziņojumi
-Comment[mk]=KDE системски известувања
-Comment[mn]=KDE-Системийн сонордуулга
-Comment[ms]= Sistem Pemberitahuan KDE
-Comment[mt]=Notifiki tas-sistema KDE
-Comment[nb]=KDE Systemvarsler
-Comment[nds]=KDE-Systeemnarichten
-Comment[ne]=KDE प्रणाली सूचना
-Comment[nl]=KDE Systeemnotificaties
-Comment[nn]=KDE Systempåminningar
-Comment[nso]=Ditsebiso tsa System ya KDE
-Comment[oc]=Notificacions dèu sistemo KDE
-Comment[pa]=KDE ਸਿਸਟਮ ਟਿੱਪਣੀਆਂ
-Comment[pl]=Powiadamianie systemowe w KDE
+Comment[hr]=sistemske obavijesti
+Comment[hsb]=systemowe powěsće
+Comment[hu]=rendszerüzenetek
+Comment[id]=Sistem Pemberitahuan
+Comment[is]=Tilkynningar kerfisins
+Comment[it]=Avvisi di sistema di
+Comment[ja]=システム通知
+Comment[ka]=სისტემური შეტყობინებები
+Comment[kk]=жүйе құлақтандырулар
+Comment[km]=ការ​ជូន​ដំណឹង​អំពី​ប្រព័ន្ធ​របស់
+Comment[ko]=시스템 알림
+Comment[lb]=System-Norichten
+Comment[lt]=Sistemos Pranešimai
+Comment[lv]=Sistēmas Paziņojumi
+Comment[mk]=системски известувања
+Comment[mn]=Системийн сонордуулга
+Comment[ms]= Sistem Pemberitahuan
+Comment[mt]=Notifiki tas-sistema
+Comment[nb]=Systemvarsler
+Comment[nds]=Systeemnarichten
+Comment[ne]=प्रणाली सूचना
+Comment[nl]=Systeemnotificaties
+Comment[nn]=Systempåminningar
+Comment[nso]=Ditsebiso tsa System ya
+Comment[oc]=Notificacions dèu sistemo
+Comment[pa]=ਸਿਸਟਮ ਟਿੱਪਣੀਆਂ
+Comment[pl]=Powiadamianie systemowe w
 Comment[pt]=Mensagens do sistema
-Comment[pt_BR]=Notificações de sistema do KDE
-Comment[ro]=Sistem de notificare KDE
-Comment[ru]=Системные сообщения KDE
-Comment[rw]=Amamenyekanisha ya Sisitemu KDE
-Comment[se]=KDE vuogádatdieđáhusat 
-Comment[sk]=KDE Systémové správy
-Comment[sl]=Sistemska obvestila KDE
-Comment[sq]=Njoftim nga Sistemi KDE
-Comment[sr]=KDE-ова системска обавештења
-Comment[sr@Latn]=KDE-ova sistemska obaveštenja
-Comment[ss]=Tatiso temshini we KDE
-Comment[sv]=KDE:s systemunderrättelser
+Comment[pt_BR]=Notificações de sistema do
+Comment[ro]=Sistem de notificare
+Comment[ru]=Системные сообщения
+Comment[rw]=Amamenyekanisha ya Sisitemu
+Comment[se]=vuogádatdieđáhusat
+Comment[sk]=Systémové správy
+Comment[sl]=Sistemska obvestila
+Comment[sq]=Njoftim nga Sistemi
+Comment[sr]=ова системска обавештења
+Comment[sr@Latn]=ova sistemska obaveštenja
+Comment[ss]=Tatiso temshini we
+Comment[sv]=systemunderrättelser
 Comment[ta]=கேடிஇ கணினி அறிவிப்புகள்
 Comment[te]=కెడిఈ వ్యవస్థ ప్రకటనలు
-Comment[tg]=Хабарҳои системавии KDE
-Comment[th]=การแจ้งเตือนของระบบ KDE
-Comment[tr]=KDE Sistem Bildirimleri
-Comment[tt]=KDE'nıñ Sistem Beldermäläre
-Comment[uk]=Системні повідомлення KDE
-Comment[uz]=KDE tizimning xabarnomalari
-Comment[uz@cyrillic]=KDE тизимнинг хабарномалари
-Comment[ven]=U divhadza maitele a KDE
-Comment[vi]=Thông báo hệ thống KDE
-Comment[wa]=Notifiaedjes sistinme di KDE
-Comment[xh]=Izaziso Zendlela ye KDE
-Comment[zh_CN]=KDE 系统通知
-Comment[zh_HK]=KDE 系統通知
-Comment[zh_TW]=KDE 系統通知
-Comment[zu]=Izaziso Zesistimu ye-KDE
+Comment[tg]=Хабарҳои системавии
+Comment[th]=การแจ้งเตือนของระบบ
+Comment[tr]=Sistem Bildirimleri
+Comment[tt]=nıñ Sistem Beldermäläre
+Comment[uk]=Системні повідомлення
+Comment[uz]=tizimning xabarnomalari
+Comment[uz@cyrillic]=тизимнинг хабарномалари
+Comment[ven]=U divhadza maitele a
+Comment[vi]=Thông báo hệ thống
+Comment[wa]=Notifiaedjes sistinme di
+Comment[xh]=Izaziso Zendlela ye
+Comment[zh_CN]=系统通知
+Comment[zh_HK]=系統通知
+Comment[zh_TW]=系統通知
+Comment[zu]=Izaziso Zesistimu ye
 
 [Trash: emptied]
 Name=Trash: emptied
@@ -352,7 +352,7 @@ Comment[lb]=D'Enn vun der Lëscht mat den Iwwerteneestëmmungen ass erreecht gin
 Comment[lt]=Pasiektas atitikmenų sąrašo galas
 Comment[lv]=Sasniegtas atbilstību saraksta beigas
 Comment[mk]=Достигнат е крајот на листата на совпаѓања
-Comment[ms]=Sampai ke akhiran senarai padanan 
+Comment[ms]=Sampai ke akhiran senarai padanan
 Comment[nb]=Har kommet til slutten av lista over treff
 Comment[nds]=Dat is dat Enn vun de List mit Övereenstimmen
 Comment[ne]=मिल्दो सूचीको अन्त्यमा पुगिएको छ
@@ -1232,7 +1232,7 @@ Name[ja]=警告
 Name[ka]=გაფრთხილება
 Name[kk]=Ескерту
 Name[km]=ព្រមាន
-Name[ko]=경고
+Name[ko]=경�
 Name[lb]=Warnung
 Name[lt]=Dėmesio
 Name[lv]=Brīdinājums
@@ -1330,7 +1330,7 @@ Comment[pt]=Ocorreu um erro grave no programa que pode causar problemas
 Comment[pt_BR]=Houve um erro no programa que pode ter causado problemas
 Comment[ro]=A apărut o eroare în program care ar putea cauza probleme
 Comment[ru]=Ошибка в программе, которая может вызвать проблемы
-Comment[rw]=Habaye ikosa muri porogaramu rishobora gutera ibibazo 
+Comment[rw]=Habaye ikosa muri porogaramu rishobora gutera ibibazo
 Comment[se]=Prográmmas lei meattáhus mii sáhttá dagahit váttisvuođaid
 Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy
 Comment[sl]=V programu je nastala napaka, ki lahko povzroči težave
@@ -1478,7 +1478,7 @@ Comment[lb]=E ganz schlëmme Feeler ass opgetrueden, deen op Mannst zum Ophale v
 Comment[lt]=Įvyko labai rimta klaida, privertusi programą bent jau baigti darbą.
 Comment[lv]=Gadījusies ļoti nopietna kļūda, kas kā minumums izraisa iziešanu no programmas
 Comment[mk]=Се случи сериозна грешка, што во најмала рака предизвика програмот да се исклучи
-Comment[mn]=Дор хаяж программыг таслан гарах ноцтой алдаа гарлаа. 
+Comment[mn]=Дор хаяж программыг таслан гарах ноцтой алдаа гарлаа.
 Comment[ms]=Ada ralat sangat serius di dalam program yang menyebabkan program keluar
 Comment[nb]=Det oppsto en alvorlig feil som til slutt førte til at programmet avsluttet
 Comment[nds]=Dor is en Malöör passeert, dat tominnst to't Enn vun't Programm föhrt hett
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 438a07a53..ed149efaa 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -920,7 +920,7 @@ void KApplication::init(bool GUIenabled)
   // * We use kdialog to warn the user, so we better not generate warnings from
   //   kdialog itself.
   // * Don't warn if we run with a read-only $HOME
-  TQCString readOnly = getenv("KDE_HOME_READONLY");
+  TQCString readOnly = getenv("TDE_HOME_READONLY");
   if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0))
   {
     KConfigGroupSaver saver(config, "KDE Action Restrictions");
@@ -1642,7 +1642,7 @@ void KApplication::parseCommandLine( )
        }
     }
 
-    bool nocrashhandler = (getenv("KDE_DEBUG") != NULL);
+    bool nocrashhandler = (getenv("TDE_DEBUG") != NULL);
     if (!nocrashhandler && args->isSet("crashhandler"))
     {
         // set default crash handler / set emergency save function to nothing
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 0b3d615ff..4596a73ca 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -148,10 +148,10 @@ KCrash::defaultCrashHandler (int sig)
       if (appName)
       {
 #ifndef NDEBUG
-        fprintf(stderr, "KCrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
-        fprintf(stderr, "KCrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
+        fprintf(stderr, "[kcrash] KCrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
+        fprintf(stderr, "[kcrash] KCrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
 #else
-        fprintf(stderr, "KCrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
+        fprintf(stderr, "[kcrash] KCrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
 #endif
 
           const char * argv[24]; // don't forget to update this
@@ -231,13 +231,13 @@ KCrash::defaultCrashHandler (int sig)
 
       }
       else {
-        fprintf(stderr, "Unknown appname\n");
+        fprintf(stderr, "[kcrash] Unknown appname\n");
       }
     }
 
     if (crashRecursionCounter < 4)
     {
-      fprintf(stderr, "Unable to start Dr. Konqi\n");
+      fprintf(stderr, "[kcrash] Unable to start Dr. Konqi\n");
     }
 #endif //Q_OS_UNIX
 
@@ -277,7 +277,7 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
     int len = strlen( argv[ i ] ) + 1; // include terminating \0
     if( pos + len > BUFSIZE )
     {
-      fprintf( stderr, "BUFSIZE in KCrash not big enough!\n" );
+      fprintf( stderr, "[kcrash] BUFSIZE in KCrash not big enough!\n" );
       startDirectly( argv, argc );
       return;
     }
@@ -320,7 +320,7 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
 // If we can't reach tdeinit we can still at least try to fork()
 void KCrash::startDirectly( const char* argv[], int )
 {
-  fprintf( stderr, "KCrash cannot reach tdeinit, launching directly.\n" );
+  fprintf( stderr, "[kcrash] KCrash cannot reach tdeinit, launching directly.\n" );
   pid_t pid = fork();
   if (pid <= 0)
   {
@@ -451,12 +451,12 @@ static int openSocket()
   {
      if (!home_dir || !home_dir[0])
      {
-        fprintf(stderr, "Warning: $HOME not set!\n");
+        fprintf(stderr, "[kcrash] Warning: $HOME not set!\n");
         return -1;
      }
      if (strlen(home_dir) > (MAX_SOCK_FILE-100))
      {
-        fprintf(stderr, "Warning: Home directory path too long!\n");
+        fprintf(stderr, "[kcrash] Warning: Home directory path too long!\n");
         return -1;
      }
      kde_home++;
@@ -473,7 +473,7 @@ static int openSocket()
       strncat(sock_file, getenv("XAUTHLOCALHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1);
   else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
   {
-     perror("Warning: Could not determine hostname: ");
+     perror("[kcrash] Warning: Could not determine hostname: ");
      return -1;
   }
   sock_file[sizeof(sock_file)-1] = '\0';
@@ -482,13 +482,13 @@ static int openSocket()
   display = getDisplay();
   if (display == NULL)
   {
-     fprintf(stderr, "Error: Could not determine display.\n");
+     fprintf(stderr, "[kcrash] Error: Could not determine display.\n");
      return -1;
   }
 
   if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
   {
-     fprintf(stderr, "Warning: Socket name will be too long.\n");
+     fprintf(stderr, "[kcrash] Warning: Socket name will be too long.\n");
      free(display);
      return -1;
   }
@@ -498,7 +498,7 @@ static int openSocket()
 
   if (strlen(sock_file) >= sizeof(server.sun_path))
   {
-     fprintf(stderr, "Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n");
+     fprintf(stderr, "[kcrash] Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n");
      return -1;
   }
 
@@ -508,7 +508,7 @@ static int openSocket()
   s = socket(PF_UNIX, SOCK_STREAM, 0);
   if (s < 0) 
   {
-     perror("Warning: socket() failed: ");
+     perror("[kcrash] Warning: socket creation failed: ");
      return -1;
   }
 
@@ -517,7 +517,7 @@ static int openSocket()
   socklen = sizeof(server);
   if(connect(s, (struct sockaddr *)&server, socklen) == -1) 
   {
-     perror("Warning: connect() failed: ");
+     perror("[kcrash] Warning: socket connection failed: ");
      close(s);
      return -1;
   }
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index fc398ef2a..cd74f9ad0 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -147,7 +147,7 @@ static bool process_flags(int flags, int& socktype, int& familyMask, int& outfla
     (flags & KExtendedSocket::canonName ? KResolver::CanonName : 0) |
     (flags & KExtendedSocket::noResolve ? KResolver::NoResolve : 0);
 
-  if (getenv("KDE_NO_IPV6"))
+  if (getenv("TDE_NO_IPV6"))
     familyMask &= ~KResolver::IPv6Family;
 
   return true;
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index d0f4ffcbb..3e96e0365 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -205,7 +205,7 @@ KConfig	*KInstance::config() const
 	}
 	
 	// Check if we are excempt from kiosk restrictions
-	if (kde_kiosk_admin && !kde_kiosk_exception && !TQCString(getenv("KDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
+	if (kde_kiosk_admin && !kde_kiosk_exception && !TQCString(getenv("TDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
 	{
             kde_kiosk_exception = true;
             d->sharedConfig = 0;
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 4577dc7a6..f1e65d0f7 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -306,9 +306,9 @@ KLibLoader::KLibLoader( TQObject* parent, const char* name )
     d = new KLibLoaderPrivate;
     lt_dlinit();
     d->unload_mode = KLibLoaderPrivate::UNKNOWN;
-    if (getenv("KDE_NOUNLOAD") != 0)
+    if (getenv("TDE_NOUNLOAD") != 0)
         d->unload_mode = KLibLoaderPrivate::DONT_UNLOAD;
-    else if (getenv("KDE_DOUNLOAD") != 0)
+    else if (getenv("TDE_DOUNLOAD") != 0)
         d->unload_mode = KLibLoaderPrivate::UNLOAD;
     d->loaded_stack.setAutoDelete( true );
 }
@@ -525,7 +525,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
   bool deleted_one = false;
   while ((wrap = d->loaded_stack.first())) {
     /* Let's first see, if we want to try to unload this lib.
-       If the env. var KDE_DOUNLOAD is set, we try to unload every lib.
+       If the env. var TDE_DOUNLOAD is set, we try to unload every lib.
        If not, we look at the lib itself, and unload it only, if it exports
        the symbol __kde_do_unload. */
     if (d->unload_mode != KLibLoaderPrivate::UNLOAD
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 90bf27d66..c4ae52b19 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -156,7 +156,7 @@ void KLocale::initLanguageList(KConfig * config, bool useEnv)
   TQStringList languageList;
   if ( useEnv )
     languageList += TQStringList::split
-      (':', TQFile::decodeName( ::getenv("KDE_LANG") ));
+      (':', TQFile::decodeName( ::getenv("TDE_LANG") ));
 
   languageList += config->readListEntry("Language", ':');
 
@@ -2074,7 +2074,7 @@ void KLocale::initFileNameEncoding(KConfig *)
 {
   // If the following environment variable is set, assume all filenames
   // are in UTF-8 regardless of the current C locale.
-  d->utf8FileEncoding = getenv("KDE_UTF8_FILENAMES") != 0;
+  d->utf8FileEncoding = getenv("TDE_UTF8_FILENAMES") != 0;
   if (d->utf8FileEncoding)
   {
     TQFile::setEncodingFunction(KLocale::encodeFileNameUTF8);
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 4359da4af..ce9dad46b 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -130,7 +130,7 @@ public:
    * The constructor looks for an entry Locale/Language in the
    * configuration file.
    * If no config file is specified, it will also look for languages
-   * using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG),
+   * using the environment variables (TDE_LANG, LC_MESSAGES, LC_ALL, LANG),
    * as well as the global configuration file. If KLocale is not able to use
    * any of the specified languages, the default language (en_US) will be
    * used.
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 8b936aa8e..229b84f9e 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1274,7 +1274,7 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
 #ifdef Q_WS_WIN
    s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #else //UNIX
-   s->defaultbindir = __KDE_BINDIR;
+   s->defaultbindir = __TDE_BINDIR;
    if (s->defaultbindir.isEmpty())
       s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
@@ -1568,7 +1568,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
 
         bool readProfiles = true;
 
-        if (kde_kiosk_admin && !TQCString(getenv("KDE_KIOSK_NO_PROFILES")).isEmpty())
+        if (kde_kiosk_admin && !TQCString(getenv("TDE_KIOSK_NO_PROFILES")).isEmpty())
             readProfiles = false;
 
         TQString userMapFile = config->readEntry("userProfileMapFile");
@@ -1630,7 +1630,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
     }
 
     // Process KIOSK restrictions.
-    if (!kde_kiosk_admin || TQCString(getenv("KDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
+    if (!kde_kiosk_admin || TQCString(getenv("TDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
     {
         config->setGroup("KDE Resource Restrictions");
         TQMap<TQString, TQString> entries = config->entryMap("KDE Resource Restrictions");
diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp
index b7763f699..3e30aa7c1 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/ksycoca.cpp
@@ -112,7 +112,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    m_str = 0;
    m_barray = 0;
    TQString path;
-   TQCString ksycoca_env = getenv("KDESYCOCA");
+   TQCString ksycoca_env = getenv("TDESYCOCA");
    if (ksycoca_env.isEmpty())
       path = KGlobal::dirs()->saveLocation("cache") + "ksycoca";
    else
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index f439b55ef..2c7b56e79 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -233,7 +233,7 @@ KTempFile::sync()
 
    if (mFd >= 0)
    {
-      if( qstrcmp( getenv( "KDE_EXTRA_FSYNC" ), "1" ) == 0 )
+      if( qstrcmp( getenv( "TDE_EXTRA_FSYNC" ), "1" ) == 0 )
       {
          result = FDATASYNC(mFd);
          if (result)
diff --git a/tdecore/malloc/README b/tdecore/malloc/README
index 6a24a39db..eed2c00ba 100644
--- a/tdecore/malloc/README
+++ b/tdecore/malloc/README
@@ -7,7 +7,7 @@ FreeBSD's libc.
  There's a new configure switch, --enable-fast-malloc. By default it's turned off, disabling
 the system libc one and using this one. Using --enable-fast-malloc=full enables this
 malloc unconditionally, aiming for the maximum performance. By using only --enable-fast-malloc,
-it's possible to select both malloc implementations at runtime. When $KDE_MALLOC is set to 0,
+it's possible to select both malloc implementations at runtime. When $TDE_MALLOC is set to 0,
 the system libc malloc is used, otherwise this malloc is used.
 
  For now, the requirements are :
@@ -31,11 +31,11 @@ changes (against malloc-2.7.0):
 #define USE_MEMCPY 0
 #define MMAP_CLEARS 1
 made all functions INLINE
-added #ifdef KDE_MALLOC_DEBUG -> #define DEBUG
+added #ifdef TDE_MALLOC_DEBUG -> #define DEBUG
 reordered all functions in order to avoid 'warning: `XYZ' declared inline after being called'
     especially moved the public_* ones at the end of the file
 commented out #including malloc.h
-added #include <config.h> at the top and enclosed whole file in #ifdef KDE_MALLOC
+added #include <config.h> at the top and enclosed whole file in #ifdef TDE_MALLOC
 taken posix_memalign() from glibc
 removed public icalloc(),icomalloc(),mtrim(),musable()  (they don't exist everywhere anyway)
 enclosed the pthreads part by #if 0 and replaced it with spinlock from glibc CVS (in x86.h)
@@ -45,7 +45,7 @@ static mutex_t spinlock = MUTEX_INITIALIZER;
 #define MALLOC_PREACTION   lock( &spinlock )
 #define MALLOC_POSTACTION  unlock( &spinlock )
 ----------
-public functions call either functions in this malloc or in libc, depending on $KDE_MALLOC
+public functions call either functions in this malloc or in libc, depending on $TDE_MALLOC
 the kde_malloc_is_used hack
 
 
diff --git a/tdecore/malloc/configure.in.in b/tdecore/malloc/configure.in.in
index d669f8daa..e1a0ff528 100644
--- a/tdecore/malloc/configure.in.in
+++ b/tdecore/malloc/configure.in.in
@@ -1,4 +1,4 @@
-dnl --enable-fast-malloc      - depends on $KDE_MALLOC
+dnl --enable-fast-malloc      - depends on $TDE_MALLOC
 dnl --disable-fast-malloc     - disabled
 dnl --enable-fast-malloc=full - enabled always
 dnl
@@ -38,7 +38,7 @@ if test "$kde_fast_malloc" != "no"; then
 dnl platforms for which there's a spinlock implementation
     case $target_cpu in
         i?86)
-            AC_DEFINE(KDE_MALLOC_X86, 1, [The platform is x86])
+            AC_DEFINE(TDE_MALLOC_X86, 1, [The platform is x86])
             ;;
         *)
             if test "$kde_fast_malloc" = "notgiven"; then
@@ -63,7 +63,7 @@ dnl warn on untested platforms
 fi
 
 if test "$kde_fast_malloc" = "yes" -o "$kde_fast_malloc" = "notgiven" -o "$kde_fast_malloc" = "debug"; then
-dnl $KDE_MALLOC needs glibc (__libc_malloc etc.)
+dnl $TDE_MALLOC needs glibc (__libc_malloc etc.)
     AC_CACHE_CHECK([if the libc is glibc],kde_cv_libc_glibc,
         [AC_TRY_COMPILE(
             [#include<stdlib.h>],
@@ -76,7 +76,7 @@ dnl $KDE_MALLOC needs glibc (__libc_malloc etc.)
             [kde_cv_libc_glibc=no])
         ])
     if test "$kde_cv_libc_glibc" = "yes"; then
-        AC_DEFINE(KDE_MALLOC_GLIBC, 1, [The libc used is glibc])
+        AC_DEFINE(TDE_MALLOC_GLIBC, 1, [The libc used is glibc])
     else
         if test "$kde_fast_malloc" = "notgiven"; then
             kde_fast_malloc=notgiven_full
@@ -116,15 +116,15 @@ else
 fi
 
 if test "$kde_fast_malloc" != "no"; then
-    AC_DEFINE(KDE_MALLOC, 1, [Use own malloc implementation])
+    AC_DEFINE(TDE_MALLOC, 1, [Use own malloc implementation])
 fi
 
 if test "$kde_fast_malloc" = "debug" -o "$kde_fast_malloc" = "debug_full"; then
-    AC_DEFINE(KDE_MALLOC_DEBUG, 1, [Enable debugging in fast malloc])
+    AC_DEFINE(TDE_MALLOC_DEBUG, 1, [Enable debugging in fast malloc])
 fi
 
 if test "$kde_fast_malloc" = "full" -o "$kde_fast_malloc" = "debug_full"; then
-    AC_DEFINE(KDE_MALLOC_FULL, 1, [Make alloc as fast as possible])
+    AC_DEFINE(TDE_MALLOC_FULL, 1, [Make alloc as fast as possible])
 fi
 
 dnl -finline-limit=<large num> is needed for gcc3 in order to inline large functions
diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c
index dba0fdef0..8f9fbb79b 100644
--- a/tdecore/malloc/malloc.c
+++ b/tdecore/malloc/malloc.c
@@ -7,9 +7,9 @@
 */
 int kde_malloc_is_used = 0;
 
-#ifdef KDE_MALLOC
+#ifdef TDE_MALLOC
 
-#ifdef KDE_MALLOC_DEBUG
+#ifdef TDE_MALLOC_DEBUG
 #define DEBUG
 #endif
 
@@ -1559,7 +1559,7 @@ static pthread_mutex_t mALLOC_MUTEx = PTHREAD_MUTEX_INITIALIZER;
 
 #else
 
-#ifdef KDE_MALLOC_X86
+#ifdef TDE_MALLOC_X86
 #include "x86.h"
 #else
 #error Unknown spinlock implementation
@@ -5475,9 +5475,9 @@ History:
 
 #ifdef USE_PUBLIC_MALLOC_WRAPPERS
 
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
 
-#ifdef KDE_MALLOC_GLIBC
+#ifdef TDE_MALLOC_GLIBC
 #include "glibc.h"
 #else
 /* cannot use dlsym(RTLD_NEXT,...) here, it calls malloc()*/
@@ -5491,7 +5491,7 @@ extern char* getenv(const char*);
 static int malloc_type = 0;
 static void init_malloc_type(void)
     {
-    const char* const env = getenv( "KDE_MALLOC" );
+    const char* const env = getenv( "TDE_MALLOC" );
     if( env == NULL )
         malloc_type = 1;
     else if( env[ 0 ] == '0' || env[ 0 ] == 'n' || env[ 0 ] == 'N' )
@@ -5503,7 +5503,7 @@ static void init_malloc_type(void)
 #endif
 
 Void_t* public_mALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5515,7 +5515,7 @@ Void_t* public_mALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_malloc( bytes );
@@ -5525,7 +5525,7 @@ Void_t* public_mALLOc(size_t bytes) {
 }
 
 void public_fREe(Void_t* m) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5535,7 +5535,7 @@ void public_fREe(Void_t* m) {
   fREe(m);
   if (MALLOC_POSTACTION != 0) {
   }
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   return;
     }
   if( malloc_type == 2 )
@@ -5549,7 +5549,7 @@ void public_fREe(Void_t* m) {
 }
 
 Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5560,7 +5560,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_realloc( m, bytes );
@@ -5570,7 +5570,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
 }
 
 Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5582,7 +5582,7 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_memalign( alignment, bytes );
@@ -5592,7 +5592,7 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
 }
 
 Void_t* public_vALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5604,7 +5604,7 @@ Void_t* public_vALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_valloc( bytes );
@@ -5614,7 +5614,7 @@ Void_t* public_vALLOc(size_t bytes) {
 }
 
 Void_t* public_pVALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5626,7 +5626,7 @@ Void_t* public_pVALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_pvalloc( bytes );
@@ -5636,7 +5636,7 @@ Void_t* public_pVALLOc(size_t bytes) {
 }
 
 Void_t* public_cALLOc(size_t n, size_t elem_size) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5648,7 +5648,7 @@ Void_t* public_cALLOc(size_t n, size_t elem_size) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_calloc( n, elem_size );
@@ -5658,7 +5658,7 @@ Void_t* public_cALLOc(size_t n, size_t elem_size) {
 }
 
 void public_cFREe(Void_t* m) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5668,7 +5668,7 @@ void public_cFREe(Void_t* m) {
   cFREe(m);
   if (MALLOC_POSTACTION != 0) {
   }
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   return;
     }
   if( malloc_type == 2 )
@@ -5682,7 +5682,7 @@ void public_cFREe(Void_t* m) {
 }
 
 struct mallinfo public_mALLINFo() {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5695,7 +5695,7 @@ struct mallinfo public_mALLINFo() {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_mallinfo();
@@ -5705,7 +5705,7 @@ struct mallinfo public_mALLINFo() {
 }
 
 int public_mALLOPt(int p, int v) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5717,7 +5717,7 @@ int public_mALLOPt(int p, int v) {
   if (MALLOC_POSTACTION != 0) {
   }
   return result;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_mallopt( p, v );
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index 83aec8bc0..c7e968c16 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -188,7 +188,7 @@ static int check_ipv6_stack()
 # ifndef AF_INET6
   return 2;			// how can we check?
 # else
-  if (getenv("KDE_NO_IPV6"))
+  if (getenv("TDE_NO_IPV6"))
      return 2;
   int fd = ::socket(AF_INET6, SOCK_STREAM, 0);
   if (fd == -1)
diff --git a/tdecore/netwm.cpp b/tdecore/netwm.cpp
index 455b6db65..bc352c8bc 100644
--- a/tdecore/netwm.cpp
+++ b/tdecore/netwm.cpp
@@ -629,7 +629,7 @@ NETRootInfo::NETRootInfo(Display *display, Window supportWindow, const char *wmN
     p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > PROPERTIES_SIZE ) {
-        fprintf( stderr, "NETRootInfo::NETRootInfo(): properties array too large\n");
+        fprintf( stderr, "[netwm] NETRootInfo::NETRootInfo(): properties array too large\n");
         properties_size = PROPERTIES_SIZE;
     }
     for( int i = 0; i < properties_size; ++i )
@@ -730,7 +730,7 @@ NETRootInfo::NETRootInfo(Display *display, const unsigned long properties[], int
     p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > 2 ) {
-        fprintf( stderr, "NETWinInfo::NETWinInfo(): properties array too large\n");
+        fprintf( stderr, "[netwm] NETWinInfo::NETWinInfo(): properties array too large\n");
         properties_size = 2;
     }
     for( int i = 0; i < properties_size; ++i )
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index cb2e21996..a6ca8e45c 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -940,7 +940,7 @@ static TQString ToUnicode(const TQString& label);
 
 static TQStringList *KResolver_initIdnDomains()
 {
-  const char *kde_use_idn = getenv("KDE_USE_IDN");
+  const char *kde_use_idn = getenv("TDE_USE_IDN");
   if (!kde_use_idn)
      kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn";
   return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower()));
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 5f0229969..77c085e08 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -63,7 +63,7 @@ static bool hasIPv6()
 #ifndef AF_INET6
   return false;
 #else
-  if (getenv("KDE_NO_IPV6") != 0L)
+  if (getenv("TDE_NO_IPV6") != 0L)
     return false;
 
   int fd = ::socket(AF_INET6, SOCK_STREAM, 0);
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index f3166b982..419873d4f 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -245,7 +245,7 @@ namespace KNetwork
     void initSrvWorker() KDE_NO_EXPORT;
     void initSrvWorker()
     {
-      if (getenv("KDE_NO_SRV") != NULL)
+      if (getenv("TDE_NO_SRV") != NULL)
 	return;
       
       KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KSrvResolverWorker>);
diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp
index 6aa93c06d..699be34cf 100644
--- a/tdecore/tests/ksimpleconfigtest.cpp
+++ b/tdecore/tests/ksimpleconfigtest.cpp
@@ -32,17 +32,17 @@ int main( int argc, char **argv )
   aConfig.writeEntry( "akey1", "avalue1" );
   aConfig.writeEntry( "akey2", "avalue2" );
 
-  fprintf( stderr, "entries written, sleeping for 10 seconds\n" );
+  fprintf( stderr, "[ksimpleconfigtest] entries written, sleeping for 10 seconds\n" );
   aConfig.sync();
   sleep( 10 );
 
   aConfig.setGroup( "Test group" );
   aConfig.deleteEntry( "key2", false );
-  fprintf( stderr, "Deleted on entry from Test group, sleeping\n" );
+  fprintf( stderr, "[ksimpleconfigtest] Deleted on entry from Test group, sleeping\n" );
   aConfig.sync();
   sleep( 10 );
 
   aConfig.deleteGroup( "Another Test group", true );
-  fprintf( stderr, "Deleted Another Test group\n" );
+  fprintf( stderr, "[ksimpleconfigtest] Deleted Another Test group\n" );
 }