Update XDG information in support of bug report 892.

58 files changed, 202 insertions, 202 deletions

diff --git a/konqueror/DESIGN_config b/konqueror/DESIGN_config
index d482107fa..ee6abf206 100644
--- a/konqueror/DESIGN_config
+++ b/konqueror/DESIGN_config
@@ -17,7 +17,7 @@ other : use builtin viewer (yes/no)  [checkbox] (i.e. application/*, like dvi, p
 - use builtin viewer (checkbox as "on")
 - use external application (checkbox as "off")
 
-(=> saved as X-KDE-AutoEmbed=true/false or no entry)
+(=> saved as X-TDE-AutoEmbed=true/false or no entry)
 
 This way, one can set choose between builtin and external for all text /
 images files, and set individual values too (e.g. an icon-team artist would
diff --git a/konqueror/Home.desktop b/konqueror/Home.desktop
index 50f8917d7..8e3a8d493 100644
--- a/konqueror/Home.desktop
+++ b/konqueror/Home.desktop
@@ -166,5 +166,5 @@ GenericName[xh]=Iifayile Zobuqu
 GenericName[zh_CN]=个人文件
 GenericName[zh_TW]=個人檔案
 GenericName[zu]=Amafayela Omuntu siqu
-Categories=Qt;KDE;Core;
+Categories=Qt;TDE;Core;
 OnlyShowIn=TDE;
diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop
index 9c59069cb..dadfdd615 100644
--- a/konqueror/about/konq_aboutpage.desktop
+++ b/konqueror/about/konq_aboutpage.desktop
@@ -81,6 +81,6 @@ Name[zh_CN]=Konqueror 的关于页面
 Name[zh_TW]=Konqueror 相關資訊
 Name[zu]=Mayelana-nekhasi le-Konqueror
 ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
-X-KDE-Library=konq_aboutpage
-X-KDE-BrowserView-HideFromMenus=true
-X-KDE-BrowserView-Built-Into=konqueror
+X-TDE-Library=konq_aboutpage
+X-TDE-BrowserView-HideFromMenus=true
+X-TDE-BrowserView-Built-Into=konqueror
diff --git a/konqueror/about/konqaboutpage.desktop b/konqueror/about/konqaboutpage.desktop
index 06d69b794..6cbca17bf 100644
--- a/konqueror/about/konqaboutpage.desktop
+++ b/konqueror/about/konqaboutpage.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KonqAboutPage
+X-TDE-ServiceType=KonqAboutPage
 # No real need for a comment
diff --git a/konqueror/iconview/konq_iconview.desktop b/konqueror/iconview/konq_iconview.desktop
index 8f85b9146..38d9d5690 100644
--- a/konqueror/iconview/konq_iconview.desktop
+++ b/konqueror/iconview/konq_iconview.desktop
@@ -81,9 +81,9 @@ Name[zh_TW]=圖示瀏覽
 Name[zu]=Umbukiso wophawu lwesithombe
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_iconview
-X-KDE-BrowserView-AllowAsDefault=true
-X-KDE-BrowserView-HideFromMenus=true
-X-KDE-BrowserView-Args=IconView
+X-TDE-Library=konq_iconview
+X-TDE-BrowserView-AllowAsDefault=true
+X-TDE-BrowserView-HideFromMenus=true
+X-TDE-BrowserView-Args=IconView
 Icon=view_icon
 InitialPreference=10
diff --git a/konqueror/iconview/konq_multicolumnview.desktop b/konqueror/iconview/konq_multicolumnview.desktop
index 2b3e55dd9..2a71a42f6 100644
--- a/konqueror/iconview/konq_multicolumnview.desktop
+++ b/konqueror/iconview/konq_multicolumnview.desktop
@@ -81,9 +81,9 @@ Name[zh_TW]=多列瀏覽
 Name[zu]=Umbukiso onamakholumu amaningi
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_iconview
-X-KDE-BrowserView-AllowAsDefault=true
-X-KDE-BrowserView-HideFromMenus=true
-X-KDE-BrowserView-Args=MultiColumnView
+X-TDE-Library=konq_iconview
+X-TDE-BrowserView-AllowAsDefault=true
+X-TDE-BrowserView-HideFromMenus=true
+X-TDE-BrowserView-Args=MultiColumnView
 Icon=view_multicolumn
 InitialPreference=9
diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop
index 2d64d47b8..aeed1da6c 100644
--- a/konqueror/kfmclient.desktop
+++ b/konqueror/kfmclient.desktop
@@ -18,5 +18,5 @@ Name[ta]=கான்கொரர்
 Name[te]=కాంకెరర్
 Name[th]=คอนเควอร์เรอร์
 X-DCOP-ServiceType=None
-Categories=Qt;KDE;System;
-X-KDE-HasTempFileOption=true
+Categories=Qt;TDE;System;
+X-TDE-HasTempFileOption=true
diff --git a/konqueror/kfmclient_dir.desktop b/konqueror/kfmclient_dir.desktop
index d35cc860e..6ccb07e90 100644
--- a/konqueror/kfmclient_dir.desktop
+++ b/konqueror/kfmclient_dir.desktop
@@ -17,4 +17,4 @@ Name[pa]=ਕੋਨਕਿਉਰੋਰ
 Name[ta]=கான்கொரர்
 Name[te]=కాంకెరర్
 Name[th]=คอนเควอร์เรอร์
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
diff --git a/konqueror/kfmclient_html.desktop b/konqueror/kfmclient_html.desktop
index e522a5246..e2e4177c6 100644
--- a/konqueror/kfmclient_html.desktop
+++ b/konqueror/kfmclient_html.desktop
@@ -17,5 +17,5 @@ Name[pa]=ਕੋਨਕਿਉਰੋਰ
 Name[ta]=கான்கொரர்
 Name[te]=కాంకెరర్
 Name[th]=คอนเควอร์เรอร์
-Categories=Qt;KDE;System;
-X-KDE-HasTempFileOption=true
+Categories=Qt;TDE;System;
+X-TDE-HasTempFileOption=true
diff --git a/konqueror/kfmclient_war.desktop b/konqueror/kfmclient_war.desktop
index 46ea85805..bece31386 100644
--- a/konqueror/kfmclient_war.desktop
+++ b/konqueror/kfmclient_war.desktop
@@ -17,5 +17,5 @@ Name[pa]=ਕੋਨਕਿਉਰੋਰ
 Name[ta]=கான்கொரர்
 Name[te]=కాంకెరర్
 Name[th]=คอนเควอร์เรอร์
-Categories=Qt;KDE;System;
-X-KDE-HasTempFileOption=true
+Categories=Qt;TDE;System;
+X-TDE-HasTempFileOption=true
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 9f5d8fc94..97da7b4f6 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -154,8 +154,8 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
   {
     service = (*it);
     // Allowed as default ?
-    TQVariant prop = service->property( "X-KDE-BrowserView-AllowAsDefault" );
-    kdDebug(1202) << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid() << endl;
+    TQVariant prop = service->property( "X-TDE-BrowserView-AllowAsDefault" );
+    kdDebug(1202) << service->desktopEntryName() << " : X-TDE-BrowserView-AllowAsDefault is valid : " << prop.isValid() << endl;
     if ( !prop.isValid() || prop.toBool() ) // defaults to true
     {
       //kdDebug(1202) << "Trying to open lib for service " << service->name() << endl;
@@ -181,7 +181,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
 
   TQStringList args;
 
-  TQVariant prop = service->property( "X-KDE-BrowserView-Args" );
+  TQVariant prop = service->property( "X-TDE-BrowserView-Args" );
 
   if ( prop.isValid() )
   {
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index dacb3e1fa..782d55e06 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -170,8 +170,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
   KTrader::OfferList::Iterator it = offers.begin();
   while ( it != offers.end() )
   {
-    TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
-    TQVariant orientation = (*it)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
+    TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
+    TQVariant orientation = (*it)->property( "X-TDE-BrowserView-ToggableView-Orientation" );
 
     if ( !prop.isValid() || !prop.toBool() ||
          !orientation.isValid() || orientation.toString().isEmpty() )
@@ -207,7 +207,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
 
     m_actions.insert( name, action );
 
-    TQVariant orientation = (*cIt)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
+    TQVariant orientation = (*cIt)->property( "X-TDE-BrowserView-ToggableView-Orientation" );
     bool horizontal = orientation.toString().lower() == "horizontal";
     m_mapOrientation.insert( name, horizontal );
   }
@@ -332,9 +332,9 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view )
     // KonqView::isToggleView() is not set yet.. so just check for the orientation
 
 #if 0
-    TQVariant vert = view->service()->property( "X-KDE-BrowserView-ToggableView-Orientation");
+    TQVariant vert = view->service()->property( "X-TDE-BrowserView-ToggableView-Orientation");
     bool vertical = vert.toString().lower() == "vertical";
-    TQVariant nohead = view->service()->property( "X-KDE-BrowserView-ToggableView-NoHeader");
+    TQVariant nohead = view->service()->property( "X-TDE-BrowserView-ToggableView-NoHeader");
     bool noheader = nohead.isValid() ? nohead.toBool() : false;
     // if it is a vertical toggle part, turn on the header.
     // this works even when konq loads the view from a profile.
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 903bd2d20..767b13817 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -761,7 +761,7 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView
     KServiceType::Ptr ptr = KServiceType::serviceType( serviceType );
     if ( ptr )
     {
-      const TQString protocol = ptr->property("X-KDE-LocalProtocol").toString();
+      const TQString protocol = ptr->property("X-TDE-LocalProtocol").toString();
       if ( !protocol.isEmpty() && KonqFMSettings::settings()->shouldEmbed( serviceType ) )
       {
         url.setProtocol( protocol );
@@ -1637,8 +1637,8 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
 
           if ( serviceKey == currentServiceKey )
           {
-              TQVariant modeProp = service->property( "X-KDE-BrowserView-ModeProperty" );
-              TQVariant modePropValue = service->property( "X-KDE-BrowserView-ModePropertyValue" );
+              TQVariant modeProp = service->property( "X-TDE-BrowserView-ModeProperty" );
+              TQVariant modePropValue = service->property( "X-TDE-BrowserView-ModePropertyValue" );
               if ( !modeProp.isValid() || !modePropValue.isValid() )
                   break;
 
@@ -3874,14 +3874,14 @@ void KonqMainWindow::initActions()
 
 
   m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" <<
-      "kde-filepreviews.desktop" << "kde-filetypes.desktop" <<
-      "kde-khtml_behavior.desktop" << "kde-khtml_java_js.desktop" <<
-      "kde-khtml_filter.desktop" <<
-      "kde-khtml_fonts.desktop" << "kde-ebrowsing.desktop" <<
-      "kde-kcmhistory.desktop" << "kde-cookies.desktop" <<
-      "kde-cache.desktop" << "kde-proxy.desktop" << "kde-kcmcss.desktop" <<
-      "kde-crypto.desktop" << "kde-useragent.desktop" <<
-      "kde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
+      "kde-filepreviews.desktop" << "tde-filetypes.desktop" <<
+      "tde-khtml_behavior.desktop" << "tde-khtml_java_js.desktop" <<
+      "tde-khtml_filter.desktop" <<
+      "tde-khtml_fonts.desktop" << "tde-ebrowsing.desktop" <<
+      "tde-kcmhistory.desktop" << "tde-cookies.desktop" <<
+      "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" <<
+      "tde-crypto.desktop" << "tde-useragent.desktop" <<
+      "tde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
 
 
   if (!kapp->authorizeControlModules(configModules()).isEmpty())
@@ -4730,7 +4730,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
           "KParts/ReadOnlyPart",
           // Obey "HideFromMenus". It defaults to false so we want "absent or true"
           // (wow, testing for 'true' if absent doesn't work, so order matters)
-          "(not exist [X-KDE-BrowserView-HideFromMenus] or not [X-KDE-BrowserView-HideFromMenus]) "
+          "(not exist [X-TDE-BrowserView-HideFromMenus] or not [X-TDE-BrowserView-HideFromMenus]) "
           "and DesktopEntryName != '"+currentServiceName+"' "
           // I had an old local dirtree.desktop without lib, no need for invalid entries
           "and exist [Library]",
@@ -5056,7 +5056,7 @@ TQString KonqMainWindow::viewModeActionKey( KService::Ptr service )
 {
     TQString library = service->library();
     // Group all non-builtin views together
-    TQVariant builtIntoProp = service->property( "X-KDE-BrowserView-Built-Into" );
+    TQVariant builtIntoProp = service->property( "X-TDE-BrowserView-Built-Into" );
     if ( !builtIntoProp.isValid() || builtIntoProp.toString() != "konqueror" )
         library = "external";
     return library;
@@ -5114,7 +5114,7 @@ void KonqMainWindow::updateViewModeActions()
   KTrader::OfferList::ConstIterator end = services.end();
   for (; it != end; ++it )
   {
-      TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
+      TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
       if ( prop.isValid() && prop.toBool() ) // No toggable views in view mode
           continue;
 
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 88fdf0147..52fdd0b20 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -257,28 +257,28 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
 
   TQVariant prop;
 
-  prop = m_service->property( "X-KDE-BrowserView-FollowActive");
+  prop = m_service->property( "X-TDE-BrowserView-FollowActive");
   if (prop.isValid() && prop.toBool())
   {
-    //kdDebug(1202) << "KonqView::switchView X-KDE-BrowserView-FollowActive -> setFollowActive" <<endl;
+    //kdDebug(1202) << "KonqView::switchView X-TDE-BrowserView-FollowActive -> setFollowActive" <<endl;
     setFollowActive(true);
   }
 
-  prop = m_service->property( "X-KDE-BrowserView-Built-Into" );
+  prop = m_service->property( "X-TDE-BrowserView-Built-Into" );
   m_bBuiltinView = (prop.isValid() && prop.toString() == "konqueror");
 
   if ( !m_pMainWindow->viewManager()->isLoadingProfile() )
   {
     // Honour "non-removeable passive mode" (like the dirtree)
-    prop = m_service->property( "X-KDE-BrowserView-PassiveMode");
+    prop = m_service->property( "X-TDE-BrowserView-PassiveMode");
     if ( prop.isValid() && prop.toBool() )
     {
-      kdDebug(1202) << "KonqView::switchView X-KDE-BrowserView-PassiveMode -> setPassiveMode" << endl;
+      kdDebug(1202) << "KonqView::switchView X-TDE-BrowserView-PassiveMode -> setPassiveMode" << endl;
       setPassiveMode( true ); // set as passive
     }
 
     // Honour "linked view"
-    prop = m_service->property( "X-KDE-BrowserView-LinkedView");
+    prop = m_service->property( "X-TDE-BrowserView-LinkedView");
     if ( prop.isValid() && prop.toBool() )
     {
       setLinkedView( true ); // set as linked
@@ -292,10 +292,10 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
     }
   }
 
-  prop = m_service->property( "X-KDE-BrowserView-HierarchicalView");
+  prop = m_service->property( "X-TDE-BrowserView-HierarchicalView");
   if ( prop.isValid() && prop.toBool() )
   {
-    kdDebug() << "KonqView::switchView X-KDE-BrowserView-HierarchicalView -> setHierarchicalView" << endl;
+    kdDebug() << "KonqView::switchView X-TDE-BrowserView-HierarchicalView -> setHierarchicalView" << endl;
     setHierarchicalView( true );  // set as hierarchial
   }
   else
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 1329000f8..5d0c0af57 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -273,7 +273,7 @@ public:
   // Toggle views and passive views are locked to their view mode.
   bool isLockedViewMode() const { return m_bToggleView || m_bPassiveMode; }
 
-  // True if "builtin" (see X-KDE-BrowserView-Built-Into)
+  // True if "builtin" (see X-TDE-BrowserView-Built-Into)
   bool isBuiltinView() const { return m_bBuiltinView; }
 
   void setService( const KService::Ptr &s ) { m_service = s; }
diff --git a/konqueror/konqbrowser.desktop b/konqueror/konqbrowser.desktop
index 81859c4e1..8545abec8 100644
--- a/konqueror/konqbrowser.desktop
+++ b/konqueror/konqbrowser.desktop
@@ -95,4 +95,4 @@ GenericName[xh]=Umkhangeli zincwadi we Web
 GenericName[zh_CN]=Web 浏览器
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zu]=Umcingi we-Web
-Categories=Qt;KDE;Network;
+Categories=Qt;TDE;Network;
diff --git a/konqueror/konqueror.desktop b/konqueror/konqueror.desktop
index e055dfac0..f76f79b9e 100644
--- a/konqueror/konqueror.desktop
+++ b/konqueror/konqueror.desktop
@@ -96,5 +96,5 @@ Comment[zh_TW]=TDE 檔案管理程式和網頁瀏覽器
 Comment[zu]=Imenenja yamafayela ye-TDE & Umcingi we-Web
 Icon=konqueror
 X-DCOP-ServiceType=multi
-X-KDE-StartupNotify=true
-X-KDE-HasTempFileOption=true
+X-TDE-StartupNotify=true
+X-TDE-HasTempFileOption=true
diff --git a/konqueror/konquerorsu.desktop b/konqueror/konquerorsu.desktop
index 572b1838e..f2e8e2646 100644
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=konqueror --profile filemanagement
 DocPath=konqueror/index.html
 Icon=kfm
-X-KDE-SubstituteUID=true
+X-TDE-SubstituteUID=true
 
 Name=File Manager - Super User Mode
 Name[af]=Lêer Bestuurder - Super Gebruiker Modus
@@ -86,5 +86,5 @@ Name[zh_TW]=檔案總管 - 超級使用者模式
 Name[zu]=Imenenja yamafayela - Indlela Yomsebenzisi Omkhulu
 
 
-Categories=Qt;KDE;X-KDE-System-su;
+Categories=Qt;TDE;X-TDE-System-su;
 NotShowIn=GNOME;
diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/khtmlkttsd.desktop
index 96bfcafeb..5e8519eb3 100644
--- a/konqueror/kttsplugin/khtmlkttsd.desktop
+++ b/konqueror/kttsplugin/khtmlkttsd.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-X-KDE-Library=libkhtmlkttsdplugin
-X-KDE-PluginInfo-Author=Olaf Schmidt
-X-KDE-PluginInfo-Email=ojschmidt@kde.org
-X-KDE-PluginInfo-Name=khtmlkttsdplugin
-X-KDE-PluginInfo-Version=3.4
-X-KDE-PluginInfo-Website=
-X-KDE-PluginInfo-Category=Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-ParentApp=konqueror
+X-TDE-Library=libkhtmlkttsdplugin
+X-TDE-PluginInfo-Author=Olaf Schmidt
+X-TDE-PluginInfo-Email=ojschmidt@kde.org
+X-TDE-PluginInfo-Name=khtmlkttsdplugin
+X-TDE-PluginInfo-Version=3.4
+X-TDE-PluginInfo-Website=
+X-TDE-PluginInfo-Category=Tools
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
+X-TDE-ParentApp=konqueror
 Name=Text-to-Speech Plugin
 Name[ar]=برنامج مساعد تحويل لفظ النص
 Name[be]=Утулка галасавога ўзнаўлення тэксту
diff --git a/konqueror/listview/konq_detailedlistview.desktop b/konqueror/listview/konq_detailedlistview.desktop
index ceb220194..626c67d57 100644
--- a/konqueror/listview/konq_detailedlistview.desktop
+++ b/konqueror/listview/konq_detailedlistview.desktop
@@ -81,8 +81,8 @@ Name[zh_TW]=詳細的清單檢視
 Name[zu]=Umbukiso Woluhlu Oluneminingwane
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_listview
-X-KDE-BrowserView-Args=DetailedList
-X-KDE-BrowserView-HideFromMenus=true
+X-TDE-Library=konq_listview
+X-TDE-BrowserView-Args=DetailedList
+X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
 InitialPreference=7
diff --git a/konqueror/listview/konq_infolistview.desktop b/konqueror/listview/konq_infolistview.desktop
index bee857315..e4477e548 100644
--- a/konqueror/listview/konq_infolistview.desktop
+++ b/konqueror/listview/konq_infolistview.desktop
@@ -79,8 +79,8 @@ Name[zh_TW]=資訊清單檢視
 Name[zu]=Umbukiso wohlu lolwazi
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_listview
-X-KDE-BrowserView-Args=InfoListView
-X-KDE-BrowserView-HideFromMenus=true
+X-TDE-Library=konq_listview
+X-TDE-BrowserView-Args=InfoListView
+X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
 InitialPreference=7
diff --git a/konqueror/listview/konq_textview.desktop b/konqueror/listview/konq_textview.desktop
index 1a88b242b..b522bec7e 100644
--- a/konqueror/listview/konq_textview.desktop
+++ b/konqueror/listview/konq_textview.desktop
@@ -82,8 +82,8 @@ Name[zh_TW]=文字檢視
 Name[zu]=Umbukiso wombhalo
 MimeType=inode/directory
 ServiceTypes=Browser/View
-X-KDE-Library=konq_listview
-X-KDE-BrowserView-Args=TextView
-X-KDE-BrowserView-HideFromMenus=true
+X-TDE-Library=konq_listview
+X-TDE-BrowserView-Args=TextView
+X-TDE-BrowserView-HideFromMenus=true
 Icon=view_text
 InitialPreference=6
diff --git a/konqueror/listview/konq_treeview.desktop b/konqueror/listview/konq_treeview.desktop
index 3f9f0890c..7f4d3eb68 100644
--- a/konqueror/listview/konq_treeview.desktop
+++ b/konqueror/listview/konq_treeview.desktop
@@ -81,9 +81,9 @@ Name[zh_TW]=樹狀瀏覽
 Name[zu]=Umbukiso Wesihlahla
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_listview
-X-KDE-BrowserView-Args=MixedTree
-X-KDE-BrowserView-HideFromMenus=true
-X-KDE-BrowserView-HierarchicalView=true
+X-TDE-Library=konq_listview
+X-TDE-BrowserView-Args=MixedTree
+X-TDE-BrowserView-HideFromMenus=true
+X-TDE-BrowserView-HierarchicalView=true
 Icon=view_tree
 InitialPreference=8
diff --git a/konqueror/preloader/konqy_preload.desktop b/konqueror/preloader/konqy_preload.desktop
index 913ff45c6..8bae334cb 100644
--- a/konqueror/preloader/konqy_preload.desktop
+++ b/konqueror/preloader/konqy_preload.desktop
@@ -69,7 +69,7 @@ Name[vi]=Tải sẵn Konqueror Trong lúc Khởi động TDE
 Name[wa]=Prétcherdjî Konqueror tins l' enondaedje di TDE
 Name[zh_CN]=在 TDE 启动时预先装入 Konqueror
 Name[zh_TW]=啟動 TDE 時預先載入 Konqueror
-X-KDE-autostart-condition=konquerorrc:Reusing:PreloadOnStartup:false
-X-KDE-StartupNotify=false
-X-KDE-autostart-phase=2
+X-TDE-autostart-condition=konquerorrc:Reusing:PreloadOnStartup:false
+X-TDE-StartupNotify=false
+X-TDE-autostart-phase=2
 OnlyShowIn=TDE;
diff --git a/konqueror/preloader/konqy_preloader.desktop b/konqueror/preloader/konqy_preloader.desktop
index da06b467a..4b5c56b91 100644
--- a/konqueror/preloader/konqy_preloader.desktop
+++ b/konqueror/preloader/konqy_preloader.desktop
@@ -139,8 +139,8 @@ Comment[wa]=Fwait enonder pus raddimint Konqueror
 Comment[zh_CN]=减少 Konqueror 启动时间
 Comment[zh_TW]=減少 Konqueror 啟動時間
 ServiceTypes=KDEDModule
-X-KDE-ModuleType=Library
-X-KDE-Library=konqy_preloader
-X-KDE-FactoryName=konqy_preloader
-X-KDE-Kded-autoload=false
-X-KDE-Kded-load-on-demand=true
+X-TDE-ModuleType=Library
+X-TDE-Library=konqy_preloader
+X-TDE-FactoryName=konqy_preloader
+X-TDE-Kded-autoload=false
+X-TDE-Kded-load-on-demand=true
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop b/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop
index 397654bef..ff121fec0 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Type=Service
-X-KDE-PluginInfo-Author=Thiago Macieira
-X-KDE-PluginInfo-Email=thiago.macieira@kdemail.net
-X-KDE-PluginInfo-Name=kremoteencodingplugin
-X-KDE-PluginInfo-Version=3.4
-X-KDE-PluginInfo-Website=
-X-KDE-PluginInfo-Category=Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-ParentApp=konqueror
+X-TDE-PluginInfo-Author=Thiago Macieira
+X-TDE-PluginInfo-Email=thiago.macieira@kdemail.net
+X-TDE-PluginInfo-Name=kremoteencodingplugin
+X-TDE-PluginInfo-Version=3.4
+X-TDE-PluginInfo-Website=
+X-TDE-PluginInfo-Category=Tools
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
+X-TDE-ParentApp=konqueror
 Icon=charset
 Name=Remote Encoding Plugin
 Name[af]=Afgeleë Enkodering Inprop Module
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.desktop b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
index f5c1b3865..93bbdf073 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.desktop
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Type=Service
-X-KDE-PluginInfo-Author=Alexander Neundorf
-X-KDE-PluginInfo-Email=neundorf@kde.org
-X-KDE-PluginInfo-Name=kshellcmdplugin
-X-KDE-PluginInfo-Version=3.4
-X-KDE-PluginInfo-Website=
-X-KDE-PluginInfo-Category=Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-ParentApp=konqueror
+X-TDE-PluginInfo-Author=Alexander Neundorf
+X-TDE-PluginInfo-Email=neundorf@kde.org
+X-TDE-PluginInfo-Name=kshellcmdplugin
+X-TDE-PluginInfo-Version=3.4
+X-TDE-PluginInfo-Website=
+X-TDE-PluginInfo-Category=Tools
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
+X-TDE-ParentApp=konqueror
 Icon=run
 Name=Shell Command Plugin
 Name[af]=Opdrag tolk inprop module
diff --git a/konqueror/sidebar/konq_sidebartng.desktop b/konqueror/sidebar/konq_sidebartng.desktop
index b5842da7f..1138395e3 100644
--- a/konqueror/sidebar/konq_sidebartng.desktop
+++ b/konqueror/sidebar/konq_sidebartng.desktop
@@ -81,13 +81,13 @@ Name[zh_TW]=導覽面板
 Name[zu]=Iwindi lemininingwane Lokuzula
 MimeType=inode/directory
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=konq_sidebar
-X-KDE-BrowserView-AllowAsDefault=false
-X-KDE-BrowserView-HideFromMenus=true
-X-KDE-BrowserView-PassiveMode=true
-X-KDE-BrowserView-Toggable=true
-X-KDE-BrowserView-ToggableView-Orientation=vertical
-X-KDE-BrowserView-HierarchicalView=true
-X-KDE-BrowserView-FollowActive=true
-X-KDE-BrowserView-LinkedView=false
-X-KDE-BrowserView-Built-Into=konqueror
+X-TDE-Library=konq_sidebar
+X-TDE-BrowserView-AllowAsDefault=false
+X-TDE-BrowserView-HideFromMenus=true
+X-TDE-BrowserView-PassiveMode=true
+X-TDE-BrowserView-Toggable=true
+X-TDE-BrowserView-ToggableView-Orientation=vertical
+X-TDE-BrowserView-HierarchicalView=true
+X-TDE-BrowserView-FollowActive=true
+X-TDE-BrowserView-LinkedView=false
+X-TDE-BrowserView-Built-Into=konqueror
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 2d46aecd6..dfdf90780 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -87,13 +87,13 @@ void addBackEnd::aboutToShowAddMenu()
 			continue;
 		}
 		if (m_universal) {
-			if (confFile->readEntry("X-KDE-KonqSidebarUniversal").upper()!="TRUE") {
+			if (confFile->readEntry("X-TDE-KonqSidebarUniversal").upper()!="TRUE") {
 				delete confFile;
 				i--;
 				continue;
 			}
 		} else {
-			if (confFile->readEntry("X-KDE-KonqSidebarBrowser").upper()=="FALSE") {
+			if (confFile->readEntry("X-TDE-KonqSidebarBrowser").upper()=="FALSE") {
 				delete confFile;
 				i--;
 				continue;
@@ -108,9 +108,9 @@ void addBackEnd::aboutToShowAddMenu()
 			menu->insertItem(confFile->readEntry("Name"), i);
 		}
 		libNames.resize(libNames.size()+1);
-		libNames.insert(libNames.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddModule")));
+		libNames.insert(libNames.count(), new TQString(confFile->readEntry("X-TDE-KonqSidebarAddModule")));
 		libParam.resize(libParam.size()+1);
-		libParam.insert(libParam.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddParam")));
+		libParam.insert(libParam.count(), new TQString(confFile->readEntry("X-TDE-KonqSidebarAddParam")));
 		delete confFile;
 	}
         menu->insertSeparator();
@@ -360,7 +360,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 		scf.writeEntry("Icon", "netscape");
 		scf.writeEntry("Name", i18n("Web SideBar Plugin"));
 		scf.writeEntry("Open", "true");
-		scf.writeEntry("X-KDE-KonqSidebarModule", "konqsidebar_web");
+		scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web");
 		scf.sync();
 
 		TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
@@ -807,7 +807,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 	TQString name = confFile->readEntry("Name");
 	TQString comment = confFile->readEntry("Comment");
 	TQString url = confFile->readPathEntry("URL",TQString::null);
-	TQString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
+	TQString lib = confFile->readEntry("X-TDE-KonqSidebarModule");
 
         delete confFile;
 
diff --git a/konqueror/sidebar/test/test.desktop b/konqueror/sidebar/test/test.desktop
index 9ede79467..e6803d320 100644
--- a/konqueror/sidebar/test/test.desktop
+++ b/konqueror/sidebar/test/test.desktop
@@ -65,4 +65,4 @@ Name[zh_TW]=測試
 Name[zu]=Isivivinyo
 
 Open=false
-X-KDE-KonqSidebarModule=konq_sidebartest
+X-TDE-KonqSidebarModule=konq_sidebartest
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 0c242a9b3..c8707970c 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -87,7 +87,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
     {
         targetURL = cfg.readURL();
 		// some services might want to make their URL configurable in kcontrol
-		TQString configured = cfg.readEntry("X-KDE-ConfiguredURL");
+		TQString configured = cfg.readEntry("X-TDE-ConfiguredURL");
 		if (!configured.isEmpty()) {
 			TQStringList list = TQStringList::split(':', configured);
 			KConfig config(list[0]);
@@ -368,7 +368,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
           {
 	      KMimeType::Ptr ptr;
 		
-	      if ( fileItem->url().isLocalFile() && (((ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-KDE-LocalProtocol").toString().isEmpty()) ))) {
+	      if ( fileItem->url().isLocalFile() && (((ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) {
 		kdDebug()<<"Something not really a directory"<<endl;
 	      } else {
 //	              kdError() << "Item " << fileItem->url().prettyURL() << " is not a directory!" << endl;
@@ -437,7 +437,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
           {
 	      KMimeType::Ptr ptr;
 		
-	      if ( fileItem->url().isLocalFile() && (( (ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) &&  ((!ptr->property("X-KDE-LocalProtocol").toString().isEmpty()) ))) {
+	      if ( fileItem->url().isLocalFile() && (( (ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) &&  ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) {
 		kdDebug()<<"Something really a directory"<<endl;
 	      } else {
 	              //kdError() << "Item " << fileItem->url().prettyURL() << " is not a directory!" << endl;
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 396b27b84..38b224555 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -3,9 +3,9 @@ Icon=history
 Type=Application
 Exec=kcmshell kcmhistory
 
-X-KDE-ModuleType=Library
-X-KDE-Library=history
-X-KDE-FactoryName=history
+X-TDE-ModuleType=Library
+X-TDE-Library=history
+X-TDE-FactoryName=history
 
 Name=History Sidebar
 Name[af]=Geskiedenis Kantbalk
@@ -230,4 +230,4 @@ Keywords[xh]=imbali,ephelelwa lixesha
 Keywords[zh_CN]=history,expire,历史,过期
 Keywords[zh_TW]=history,expire,歷史紀錄,過期
 Keywords[zu]=umlando,ukuphelelwa isikhathi
-Categories=Qt;KDE;X-KDE-settings-webbrowsing;
+Categories=Qt;TDE;X-TDE-settings-webbrowsing;
diff --git a/konqueror/sidebar/trees/init/bookmarks.desktop b/konqueror/sidebar/trees/init/bookmarks.desktop
index 1707aba6b..60d0b047d 100644
--- a/konqueror/sidebar/trees/init/bookmarks.desktop
+++ b/konqueror/sidebar/trees/init/bookmarks.desktop
@@ -160,6 +160,6 @@ Comment[zh_CN]=这是您的书签列表，以便使得访问更加方便
 Comment[zh_TW]=快速存取網站的書籤列表
 Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
 Open=false
-X-KDE-TreeModule=Bookmarks
-X-KDE-SearchableTreeModule=true
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Bookmarks
+X-TDE-SearchableTreeModule=true
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/bookmarks_module.desktop b/konqueror/sidebar/trees/init/bookmarks_module.desktop
index 4f6c96324..c375907c6 100644
--- a/konqueror/sidebar/trees/init/bookmarks_module.desktop
+++ b/konqueror/sidebar/trees/init/bookmarks_module.desktop
@@ -160,7 +160,7 @@ Comment[zh_CN]=这是您的书签列表，以便使得访问更加方便
 Comment[zh_TW]=快速存取網站的書籤列表
 Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
 Open=false
-X-KDE-TreeModule=Bookmarks
-X-KDE-SearchableTreeModule=true
-X-KDE-TreeModule-Lib=konq_sidebartree_bookmarks
-X-KDE-Default-URL=
+X-TDE-TreeModule=Bookmarks
+X-TDE-SearchableTreeModule=true
+X-TDE-TreeModule-Lib=konq_sidebartree_bookmarks
+X-TDE-Default-URL=
diff --git a/konqueror/sidebar/trees/init/dirtree_module.desktop b/konqueror/sidebar/trees/init/dirtree_module.desktop
index 7db283eb2..688d423d4 100644
--- a/konqueror/sidebar/trees/init/dirtree_module.desktop
+++ b/konqueror/sidebar/trees/init/dirtree_module.desktop
@@ -76,7 +76,7 @@ Name[zh_CN]=文件夹
 Name[zh_TW]=資料夾
 Open=false
 
-X-KDE-TreeModule=Directory
-X-KDE-TreeModule-Lib=konq_sidebartree_dirtree
-X-KDE-Default-URL=file:/
-X-KDE-TreeModule-ShowHidden=false
+X-TDE-TreeModule=Directory
+X-TDE-TreeModule-Lib=konq_sidebartree_dirtree
+X-TDE-Default-URL=file:/
+X-TDE-TreeModule-ShowHidden=false
diff --git a/konqueror/sidebar/trees/init/history.desktop b/konqueror/sidebar/trees/init/history.desktop
index f81c3a56f..f7ce6a7f6 100644
--- a/konqueror/sidebar/trees/init/history.desktop
+++ b/konqueror/sidebar/trees/init/history.desktop
@@ -159,6 +159,6 @@ Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式
 Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
 Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
 Open=false
-X-KDE-TreeModule=History
-X-KDE-SearchableTreeModule=true
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=History
+X-TDE-SearchableTreeModule=true
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/history_module.desktop b/konqueror/sidebar/trees/init/history_module.desktop
index 47d26b3b6..0476ff56a 100644
--- a/konqueror/sidebar/trees/init/history_module.desktop
+++ b/konqueror/sidebar/trees/init/history_module.desktop
@@ -159,7 +159,7 @@ Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式
 Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
 Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
 Open=false
-X-KDE-TreeModule=History
-X-KDE-SearchableTreeModule=true
-X-KDE-TreeModule-Lib=konq_sidebartree_history
-X-KDE-Default-URL=
+X-TDE-TreeModule=History
+X-TDE-SearchableTreeModule=true
+X-TDE-TreeModule-Lib=konq_sidebartree_history
+X-TDE-Default-URL=
diff --git a/konqueror/sidebar/trees/init/home.desktop b/konqueror/sidebar/trees/init/home.desktop
index d18f98466..30ad5490d 100644
--- a/konqueror/sidebar/trees/init/home.desktop
+++ b/konqueror/sidebar/trees/init/home.desktop
@@ -154,5 +154,5 @@ Comment[zh_CN]=此文件夹包含了您的个人文件
 Comment[zh_TW]=這個資料夾包含有您的個人文件
 Comment[zu]=Lesi sigcini samafayela siqukethe amafayela akho siqu
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote.desktop b/konqueror/sidebar/trees/init/remote.desktop
index adc02b1cc..99869d192 100644
--- a/konqueror/sidebar/trees/init/remote.desktop
+++ b/konqueror/sidebar/trees/init/remote.desktop
@@ -82,6 +82,6 @@ Name[zh_TW]=網路
 Name[zu]=Uxhumano olusakazekile
 Icon=network
 Open=false
-X-KDE-TreeModule=Virtual
-X-KDE-RelURL=remote
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Virtual
+X-TDE-RelURL=remote
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop b/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
index 3021fe215..724861cbe 100644
--- a/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
+++ b/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
@@ -84,5 +84,5 @@ Name[zh_CN]=KDE 官方 FTP
 Name[zh_TW]=KDE 官方 FTP 站
 Name[zu]=I-FTP esemthethweni ye-KDE
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote/web/apps_web.desktop b/konqueror/sidebar/trees/init/remote/web/apps_web.desktop
index 694c4a04f..6d9356509 100644
--- a/konqueror/sidebar/trees/init/remote/web/apps_web.desktop
+++ b/konqueror/sidebar/trees/init/remote/web/apps_web.desktop
@@ -83,5 +83,5 @@ Name[zh_TW]=KDE 應用程式
 Name[zu]=Abayaleli be-KDE
 Icon=www
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote/web/dot_web.desktop b/konqueror/sidebar/trees/init/remote/web/dot_web.desktop
index 9743376df..b5105eaa2 100644
--- a/konqueror/sidebar/trees/init/remote/web/dot_web.desktop
+++ b/konqueror/sidebar/trees/init/remote/web/dot_web.desktop
@@ -82,5 +82,5 @@ Name[zh_TW]=KDE 新聞
 Name[zu]=Izindaba ze-KDE
 Icon=www
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote/web/kde_web.desktop b/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
index b5712eb1f..e32495a7e 100644
--- a/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
+++ b/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
@@ -84,5 +84,5 @@ Name[zh_TW]=KDE 首頁
 Name[zu]=Ikhasi lasekhaya le-KDE
 Icon=www
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/remote/web/look_web.desktop b/konqueror/sidebar/trees/init/remote/web/look_web.desktop
index eadd73827..0d461e095 100644
--- a/konqueror/sidebar/trees/init/remote/web/look_web.desktop
+++ b/konqueror/sidebar/trees/init/remote/web/look_web.desktop
@@ -50,5 +50,5 @@ Name[wa]=KDE bea po ls ouys
 Name[zh_CN]=KDE 眼福
 Icon=www
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/root.desktop b/konqueror/sidebar/trees/init/root.desktop
index b206da8e7..d022bb00f 100644
--- a/konqueror/sidebar/trees/init/root.desktop
+++ b/konqueror/sidebar/trees/init/root.desktop
@@ -154,5 +154,5 @@ Comment[zh_CN]=这是文件系统的根
 Comment[zh_TW]=這是檔案系統的根目錄
 Comment[zu]=Le yimpande yesistimu yamafayela
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services.desktop b/konqueror/sidebar/trees/init/services.desktop
index 72c51db89..57437c6fb 100644
--- a/konqueror/sidebar/trees/init/services.desktop
+++ b/konqueror/sidebar/trees/init/services.desktop
@@ -80,6 +80,6 @@ Name[zh_CN]=服务
 Name[zh_TW]=服務
 Name[zu]=Imisebenzi
 Open=false
-X-KDE-TreeModule=Virtual
-X-KDE-RelURL=services
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Virtual
+X-TDE-RelURL=services
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services/applications.desktop b/konqueror/sidebar/trees/init/services/applications.desktop
index 0996b0e9e..4892532d7 100644
--- a/konqueror/sidebar/trees/init/services/applications.desktop
+++ b/konqueror/sidebar/trees/init/services/applications.desktop
@@ -75,5 +75,5 @@ Name[wa]=Programes
 Name[zh_CN]=应用程序
 Name[zh_TW]=應用程式
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services/audiocd.desktop b/konqueror/sidebar/trees/init/services/audiocd.desktop
index a7a8e3f27..e3049f288 100644
--- a/konqueror/sidebar/trees/init/services/audiocd.desktop
+++ b/konqueror/sidebar/trees/init/services/audiocd.desktop
@@ -81,5 +81,5 @@ Name[zh_CN]=音频 CD 浏览器
 Name[zh_TW]=音樂 CD 瀏覽器
 Name[zu]=Umcingi wama-CD ozwakalayo
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services/media.desktop b/konqueror/sidebar/trees/init/services/media.desktop
index edff531f9..1a7a85c19 100644
--- a/konqueror/sidebar/trees/init/services/media.desktop
+++ b/konqueror/sidebar/trees/init/services/media.desktop
@@ -70,5 +70,5 @@ Name[wa]=Sopoirts di wårdaedje
 Name[zh_CN]=存储介质
 Name[zh_TW]=儲存媒體
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services/printsystem.desktop b/konqueror/sidebar/trees/init/services/printsystem.desktop
index b51737e50..036b66ec0 100644
--- a/konqueror/sidebar/trees/init/services/printsystem.desktop
+++ b/konqueror/sidebar/trees/init/services/printsystem.desktop
@@ -81,5 +81,5 @@ Name[zh_CN]=打印系统浏览器
 Name[zh_TW]=列印系統瀏覽器
 Name[zu]=Umcingi wesistimu yokushicilela
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/services/settings.desktop b/konqueror/sidebar/trees/init/services/settings.desktop
index 416d5a69b..6b08b316e 100644
--- a/konqueror/sidebar/trees/init/services/settings.desktop
+++ b/konqueror/sidebar/trees/init/services/settings.desktop
@@ -77,5 +77,5 @@ Name[wa]=Apontiaedjes
 Name[zh_CN]=设置
 Name[zh_TW]=設定
 Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop
index 490b4ef7f..9e87b0470 100644
--- a/konqueror/sidebar/trees/init/system.desktop
+++ b/konqueror/sidebar/trees/init/system.desktop
@@ -135,5 +135,5 @@ Comment[wa]=Ci ridant chal vos permete d' aler ås comonès plaeces so vosse cop
 Comment[zh_CN]=此文件夹允许您访问计算机中的公共位置
 Comment[zh_TW]=這個資料夾允許存取您電腦上的共同空間
 Open=true
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
diff --git a/konqueror/sidebar/trees/init/virtualfolderadd.desktop b/konqueror/sidebar/trees/init/virtualfolderadd.desktop
index 0af894ac6..fbbb076d6 100644
--- a/konqueror/sidebar/trees/init/virtualfolderadd.desktop
+++ b/konqueror/sidebar/trees/init/virtualfolderadd.desktop
@@ -76,6 +76,6 @@ Name[zh_CN]=文件夹
 Name[zh_TW]=資料夾
 
 Open=false
-X-KDE-KonqSidebarAddParam=
-X-KDE-KonqSidebarAddModule=konqsidebar_tree
-X-KDE-KonqSidebarUniversal=true
+X-TDE-KonqSidebarAddParam=
+X-TDE-KonqSidebarAddModule=konqsidebar_tree
+X-TDE-KonqSidebarUniversal=true
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index e6cfacbf8..2ed02b6cf 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -95,8 +95,8 @@ void KonqSidebarTree::loadModuleFactories()
   {
     KSimpleConfig ksc(*it);
     ksc.setGroup("Desktop Entry");
-    TQString name    = ksc.readEntry("X-KDE-TreeModule");
-    TQString libName = ksc.readEntry("X-KDE-TreeModule-Lib");
+    TQString name    = ksc.readEntry("X-TDE-TreeModule");
+    TQString libName = ksc.readEntry("X-TDE-TreeModule-Lib");
     if ((name.isEmpty()) || (libName.isEmpty()))
         {kdWarning()<<"Bad Configuration file for a dirtree module "<<*it<<endl; continue;}
 
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
             // Version 5 includes the audiocd browser
             // Version 6 includes the printmanager and lan browser
             const int currentVersion = 6;
-            TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
+            TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber");
             KSimpleConfig versionCfg( path + "/.directory" );
             int versionNumber = versionCfg.readNumEntry( key, 1 );
             kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -771,8 +771,8 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent,  const TQSt
 
     // Here's where we need to create the right module...
     // ### TODO: make this KTrader/KLibrary based.
-    TQString moduleName = cfg.readEntry( "X-KDE-TreeModule" );
-    TQString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden");
+    TQString moduleName = cfg.readEntry( "X-TDE-TreeModule" );
+    TQString showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden");
 
     if (moduleName.isEmpty()) moduleName="Directory";
     kdDebug(1201) << "##### Loading module: " << moduleName << " file: " << filename << endl;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 17a552998..ffde542b0 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -19,12 +19,12 @@ KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget
 	{
 		KSimpleConfig ksc(desktopName_);
 		ksc.setGroup("Desktop Entry");
-		int virt= ( (ksc.readEntry("X-KDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
-		if (virt==1) desktopName_=ksc.readEntry("X-KDE-RelURL","");
+		int virt= ( (ksc.readEntry("X-TDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
+		if (virt==1) desktopName_=ksc.readEntry("X-TDE-RelURL","");
 
 		widget = new TQVBox(widgetParent);
 
-		if (ksc.readBoolEntry("X-KDE-SearchableTreeModule",false)) {
+		if (ksc.readBoolEntry("X-TDE-SearchableTreeModule",false)) {
 			TQHBox* searchline = new TQHBox(widget);
 			searchline->setSpacing(KDialog::spacingHint());
 			tree=new KonqSidebarTree(this,widget,virt,desktopName_);
@@ -156,10 +156,10 @@ extern "C"
 			map->insert("Icon",ksc2.readEntry("Icon"));
 			map->insert("Name",ksc2.readEntry("Name"));
 		 	map->insert("Open","false");
-			map->insert("URL",ksc2.readEntry("X-KDE-Default-URL"));
-			map->insert("X-KDE-KonqSidebarModule","konqsidebar_tree");
-			map->insert("X-KDE-TreeModule",ksc2.readEntry("X-KDE-TreeModule"));
-			map->insert("X-KDE-TreeModule-ShowHidden",ksc2.readEntry("X-KDE-TreeModule-ShowHidden"));
+			map->insert("URL",ksc2.readEntry("X-TDE-Default-URL"));
+			map->insert("X-TDE-KonqSidebarModule","konqsidebar_tree");
+			map->insert("X-TDE-TreeModule",ksc2.readEntry("X-TDE-TreeModule"));
+			map->insert("X-TDE-TreeModule-ShowHidden",ksc2.readEntry("X-TDE-TreeModule-ShowHidden"));
 			fn->setLatin1("dirtree%1.desktop");
 			return true;
 		}
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 2c8de18f8..695bc4d69 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -209,7 +209,7 @@ extern "C" {
 		map->insert("Icon", "netscape");
 		map->insert("Name", i18n("Web SideBar Plugin"));
 		map->insert("Open", "true");
-		map->insert("X-KDE-KonqSidebarModule","konqsidebar_web");
+		map->insert("X-TDE-KonqSidebarModule","konqsidebar_web");
 		fn->setLatin1("websidebarplugin%1.desktop");
 		return true;
 	}
diff --git a/konqueror/sidebar/web_module/webmodule_add.desktop b/konqueror/sidebar/web_module/webmodule_add.desktop
index 78a9972e2..a42601c88 100644
--- a/konqueror/sidebar/web_module/webmodule_add.desktop
+++ b/konqueror/sidebar/web_module/webmodule_add.desktop
@@ -75,5 +75,5 @@ Name[wa]=Module di bår di costé waibe
 Name[zh_CN]=Web 侧边栏模块
 Name[zh_TW]=網頁邊列模組
 Open=false
-X-KDE-KonqSidebarAddModule=konqsidebar_web
-X-KDE-KonqSidebarUniversal=true
+X-TDE-KonqSidebarAddModule=konqsidebar_web
+X-TDE-KonqSidebarUniversal=true
diff --git a/konqueror/sidebar/web_module/websidebar.desktop b/konqueror/sidebar/web_module/websidebar.desktop
index 30413e06a..8a245e188 100644
--- a/konqueror/sidebar/web_module/websidebar.desktop
+++ b/konqueror/sidebar/web_module/websidebar.desktop
@@ -75,4 +75,4 @@ Name[wa]=Module di bår di costé waibe
 Name[zh_CN]=Web 侧边栏模块
 Name[zh_TW]=網頁邊列模組
 Open=false
-X-KDE-KonqSidebarModule=konqsidebar_web
+X-TDE-KonqSidebarModule=konqsidebar_web