Rename a number of libraries and executables to avoid conflicts with KDE4

143 files changed, 255 insertions, 255 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 4be09b41..5d618731 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2128,7 +2128,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index fd437845..178229b6 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -16,7 +16,7 @@
 #include "contextbrowser.h"
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <knewstuff/downloaddialog.h> // knewstuff theme fetching
 #include <knewstuff/engine.h>         // "
@@ -24,7 +24,7 @@
 #include <knewstuff/provider.h>       // "
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index d0bce4de..1a3d27f1 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -8,7 +8,7 @@
 
 #include <kurl.h> // recursiveUrlExpand
 #include <kprocio.h> //Amarok::ProcIO
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdeversion.h>
 
 #include "amarok_export.h"
diff --git a/amarok/src/amarokcore/amarokconfig.kcfgc b/amarok/src/amarokcore/amarokconfig.kcfgc
index f8a0c8fd..1ee0fbf0 100644
--- a/amarok/src/amarokcore/amarokconfig.kcfgc
+++ b/amarok/src/amarokcore/amarokconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=amarok.kcfg
 ClassName=AmarokConfig
 Singleton=true
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 8c4c0833..c955be60 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -13,7 +13,7 @@
 
 #include <cmath>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h> //paletteChange()
 #include <kiconloader.h>     //mousePressEvent
 #include <klocale.h>         //mousePressEvent
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index a97197d9..77ad4b3a 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -51,7 +51,7 @@ email                : markey@web.de
 
 #include <iostream>
 
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcombobox.h>           //firstRunWizard()
 #include <kcmdlineargs.h>        //initCliArgs()
 #include <kcursor.h>             //Amarok::OverrideCursor
@@ -66,7 +66,7 @@ email                : markey@web.de
 #include <kstandarddirs.h>
 #include <kurldrag.h>            //genericEventHandler()
 #include <kaboutdata.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqevent.h>              //genericEventHandler()
 #include <tqeventloop.h>          //applySettings()
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 0d20000c..88e1af1a 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -16,7 +16,7 @@
 #include "multitabbar.h"   //m_tabBar
 
 #include <kapplication.h>  //kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>   //multiTabBar icons
 #include <klocale.h>
 
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 537c5d6b..3f1517a7 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -54,7 +54,7 @@
 
 #include <kactioncollection.h>
 #include <kapplication.h>   //kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kdialogbase.h>
@@ -65,7 +65,7 @@
 #include <kpopupmenu.h>
 #include <ktoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kpushbutton.h>
 
 extern "C"
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 2588b12c..589751f8 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -52,7 +52,7 @@
 
 #include <kcharsets.h>            //setHTMLLyrics()
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>          //checkDatabase()
 #include <kglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
@@ -62,8 +62,8 @@
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include <cmath>                 //DbConnection::sqlite_power()
 #include <ctime>                 //query()
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 11c827dd..8c24bf1b 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -62,7 +62,7 @@ email                : markey@web.de
 namespace Amarok {
     int databaseTypeCode( const TQString type )
     {
-        // can't use kconfigxt for the database comboxbox since we need the DBConnection id and not the index
+        // can't use tdeconfigxt for the database comboxbox since we need the DBConnection id and not the index
         int dbType = DbConnection::sqlite;
         if ( type == "MySQL")
             dbType = DbConnection::mysql;
@@ -283,7 +283,7 @@ void AmarokConfigDialog::updateSettings()
     }
 
     if ( m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() ) {
-        //can't use kconfigxt for the style comboxbox's since we need the string, not the index
+        //can't use tdeconfigxt for the style comboxbox's since we need the string, not the index
         AmarokConfig::setContextBrowserStyleSheet( m_opt2->styleComboBox->currentText() );
         ContextBrowser::instance()->reloadStyleSheet();
     }
diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h
index 8634041f..779f9aff 100644
--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@@ -19,7 +19,7 @@ email                : markey@web.de
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class TQComboBox;
 class TQGroupBox;
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 722ea234..394b2589 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -55,13 +55,13 @@
 #include <kaction.h>
 #include <kapplication.h> //kapp
 #include <kcalendarsystem.h>  // for Amarok::verboseTimeSince()
-#include <kconfig.h> // suggested/related/favorite box visibility
+#include <tdeconfig.h> // suggested/related/favorite box visibility
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kmdcodec.h> // for data: URLs
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 0b66dcc8..fe0e5f05 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -23,9 +23,9 @@
 #include <kcursor.h> //waiting cursor
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 84e65e16..91bf9e53 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -35,15 +35,15 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>    //showCoverMenu()
 #include <tdemultipledrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpopupmenu.h>    //showCoverMenu()
 #include <kprogress.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index 250bf9dc..b43a633d 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -29,16 +29,16 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klineedit.h>            //setupCoverFetcher()
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <cmath>                 //DbConnection::sqlite_power()
 #include <ctime>                 //query()
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index 846a02fa..253313c0 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -13,12 +13,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
index 98d82758..faff1a6f 100644
--- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp
+++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
@@ -24,7 +24,7 @@ AMAROK_EXPORT_PLUGIN( MassStorageDeviceHandlerFactory )
 #include "collectiondb.h"
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp
index 1e90653a..9ea9f10b 100644
--- a/amarok/src/device/nfs/nfsdevicehandler.cpp
+++ b/amarok/src/device/nfs/nfsdevicehandler.cpp
@@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( NfsDeviceHandlerFactory )
 
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp
index 3ee45a0e..fbcc92ec 100644
--- a/amarok/src/device/smb/smbdevicehandler.cpp
+++ b/amarok/src/device/smb/smbdevicehandler.cpp
@@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( SmbDeviceHandlerFactory )
 
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index 78cf15d3..414d9989 100644
--- a/amarok/src/directorylist.cpp
+++ b/amarok/src/directorylist.cpp
@@ -20,7 +20,7 @@
 #include "directorylist.h"
 #include "mountpointmanager.h"
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 
 #include <tqfile.h>
diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test
index a2860f35..8f3d6d44 100644
--- a/amarok/src/engine/helix/Makefile.test
+++ b/amarok/src/engine/helix/Makefile.test
@@ -61,7 +61,7 @@ install:
 	install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY)
 	install -p -C -m 755 $(SLIBRARY:.so=.la) /usr/lib/trinity/$(SLIBRARY:.so=.la)
 	install -p -C -m 644 amarok_helixengine_plugin.desktop /usr/share/services/amarok_helixengine_plugin.desktop
-#	kbuildsycoca
+#	tdebuildsycoca
 
 uninstall:
 	rm -f /usr/lib/trinity/$(SLIBRARY:.so=.la)
diff --git a/amarok/src/engine/helix/config/helixconfig.kcfgc b/amarok/src/engine/helix/config/helixconfig.kcfgc
index c0f6079d..ee1b279c 100644
--- a/amarok/src/engine/helix/config/helixconfig.kcfgc
+++ b/amarok/src/engine/helix/config/helixconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=helixconfig.kcfg
 ClassName=HelixConfig
 Singleton=true
diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp
index b39033e0..3dc1aac6 100644
--- a/amarok/src/engine/kdemm/kdemmengine.cpp
+++ b/amarok/src/engine/kdemm/kdemmengine.cpp
@@ -33,9 +33,9 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index 91ccffcc..9b9668bd 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -31,8 +31,8 @@ what                 : interface to the Media Application Server (MAS)
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index 77639658..eb0c5fd9 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -49,7 +49,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
index 8db0f8c5..6568b5cc 100644
--- a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
+++ b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=nmm_kdeconfig.kcfg
 ClassName=NmmKDEConfig
 Singleton=true
diff --git a/amarok/src/engine/xine/xinecfg.kcfgc b/amarok/src/engine/xine/xinecfg.kcfgc
index 127cdf81..9bd6faa1 100644
--- a/amarok/src/engine/xine/xinecfg.kcfgc
+++ b/amarok/src/engine/xine/xinecfg.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=xinecfg.kcfg
 ClassName=XineCfg
 Singleton=true
diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp
index b6d1ab15..b6cdb27c 100644
--- a/amarok/src/enginecontroller.cpp
+++ b/amarok/src/enginecontroller.cpp
@@ -30,9 +30,9 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kfileitem.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <krun.h>
 
@@ -187,7 +187,7 @@ EngineController::loadEngine( const TQString &engineName )
         }
     }
 
-    KRun::runCommand( "kbuildsycoca" );
+    KRun::runCommand( "tdebuildsycoca" );
 
     KMessageBox::error( 0, i18n(
             "<p>Amarok could not find any sound-engine plugins. "
@@ -197,7 +197,7 @@ EngineController::loadEngine( const TQString &engineName )
             "$ cd /path/to/amarok/source-code/<br>"
             "$ su -c \"make uninstall\"<br>"
             "$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\"<br>"
-            "$ kbuildsycoca<br>"
+            "$ tdebuildsycoca<br>"
             "$ amarok</pre>"
             "More information can be found in the README file. For further assistance join us at #amarok on irc.freenode.net.</p>" ) );
 
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index f2a631b5..2c285ba6 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -33,7 +33,7 @@
 #include "kbookmarkhandler.h"
 #include <kdiroperator.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index 9bad6f24..9331c55b 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -88,7 +88,7 @@ private:
 
 
 
-#include <kfileitem.h> //KFileItemList
+#include <tdefileitem.h> //KFileItemList
 #include <tqregexp.h>
 
 class KDirLister;
diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h
index 97964e4e..aed5e9cb 100644
--- a/amarok/src/firstrunwizard.ui.h
+++ b/amarok/src/firstrunwizard.ui.h
@@ -15,7 +15,7 @@
 #include "directorylist.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index 22f76889..c068c333 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -26,8 +26,8 @@
 #include "ktrm.h"
 
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
 #include <kurl.h>
 #include <kresolver.h>
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 86216c34..5c631ffc 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -34,8 +34,8 @@
 #include <klineedit.h>
 #include <kmdcodec.h>       //md5sum
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
 #include <kshortcut.h>
 #include <kurl.h>
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index 2f597d0d..0c2e0666 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -25,7 +25,7 @@
 #include <tqurl.h>
 #include <tqvaluelist.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class KLineEdit;
 class KAction;
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
index a05150a7..c160cd30 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@@ -22,8 +22,8 @@
 
 #include "magnatunedownloadinfo.h"
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqobject.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index f1f87ed3..a9b02293 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -25,8 +25,8 @@
 #include "statusbar.h"
 
 #include <tdehtml_part.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 /**
 A specialized KHTMLPart for displaying html info about a Magnatune artist or album
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h
index 5c4948ea..91c4f0d1 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@@ -30,8 +30,8 @@
 #include "magnatuneredownloadhandler.h"
 #include "magnatunexmlparser.h"
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
index 6959139e..60a6c273 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #include "debug.h"
 #include "magnatunedownloaddialog.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index 0f1f02c9..c1bd858e 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -21,8 +21,8 @@
 #define MAGNATUNEPURCHASEHANDLER_H
 
 #include <tqobject.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "magnatunealbumdownloader.h"
 #include "magnatunedownloaddialog.h"
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index f852cb73..8e7644dd 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -60,11 +60,11 @@
 #include <kapplication.h> //kapp
 #include <kcombobox.h>
 #include <kdirlister.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdemultipledrag.h>
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index 6845b257..87cd4341 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -21,7 +21,7 @@
 
 #include <klistview.h>       //baseclass
 #include <kurl.h>            //stack allocated
-#include <kio/global.h>      //filesize_t
+#include <tdeio/global.h>      //filesize_t
 #include "scrobbler.h"       //SubmitItem
 #include "metabundle.h"
 
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 17843511..1d5c2d9e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -37,12 +37,12 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include "genericmediadeviceconfigdialog.h"
 
 #include <kapplication.h>
-#include <kconfig.h>           //download saveLocation
+#include <tdeconfig.h>           //download saveLocation
 #include <kdiskfreesp.h>
 #include <kiconloader.h>       //smallIcon
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kmountpoint.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/mediadevice/ifp/CMakeLists.txt b/amarok/src/mediadevice/ifp/CMakeLists.txt
index 6e24a602..d8a46739 100644
--- a/amarok/src/mediadevice/ifp/CMakeLists.txt
+++ b/amarok/src/mediadevice/ifp/CMakeLists.txt
@@ -35,6 +35,6 @@ install( FILES
 
 tde_add_kpart( libamarok_ifp-mediadevice AUTOMOC
   SOURCES ifpmediadevice.cpp
-  LINK amarok-shared kio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
+  LINK amarok-shared tdeio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index 89054a26..a14bf31f 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -34,7 +34,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include "transferdialog.h"
 
 #include <kapplication.h>
-#include <kconfig.h>           //download saveLocation
+#include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index edfe497c..3eb8fec8 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -36,7 +36,7 @@ extern "C" {
 #include <tqptrlist.h>
 #include <tqdict.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQCheckBox;
 class TQLabel;
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index ec2cf48e..5aab72d4 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -39,7 +39,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>       //smallIcon
 #include <kinstance.h>
 #include <klocale.h>
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h
index d52d2536..ff14d8dc 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@@ -41,8 +41,8 @@
 
 // kde
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 /**
   This class is used to manipulate Nomad Creative Jukebox and others media player that works with the njb libraries.
diff --git a/amarok/src/medium.cpp b/amarok/src/medium.cpp
index b20083b2..b05de959 100644
--- a/amarok/src/medium.cpp
+++ b/amarok/src/medium.cpp
@@ -19,7 +19,7 @@
 #include "debug.h"
 #include "medium.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 const TQString Medium::SEPARATOR = "---";
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index a80d80e1..56960608 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kactivelabel.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index b34a3fc7..735e4ea9 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -20,7 +20,7 @@
 #include <tqmap.h>
 #include <tqhbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index 5e7464ce..8580952c 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -22,11 +22,11 @@
 #include "collectiondb.h"
 #include "metabundlesaver.h"
 #include <kapplication.h>
-#include <kfilemetainfo.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmdcodec.h>
 #include <tqdeepcopy.h>
 #include <tqfile.h> //decodePath()
diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp
index 612d30b9..8025ee48 100644
--- a/amarok/src/metabundlesaver.cpp
+++ b/amarok/src/metabundlesaver.cpp
@@ -20,11 +20,11 @@
 #include "metabundlesaver.h"
 #include "scancontroller.h"
 #include <kapplication.h>
-#include <kfilemetainfo.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmdcodec.h>
 #include <kurl.h>
 #include <tqfile.h> //decodePath()
diff --git a/amarok/src/metadata/tplugins.cpp b/amarok/src/metadata/tplugins.cpp
index d20e4bcc..a76297f1 100644
--- a/amarok/src/metadata/tplugins.cpp
+++ b/amarok/src/metadata/tplugins.cpp
@@ -39,7 +39,7 @@
 #ifndef TAGLIB_15
 #include "trueaudio/taglib_trueaudiofiletyperesolver.h"
 #include "trueaudio/ttafile.h"
-#include "wavpack/taglib_wavpackfiletyperesolver.h"
+#include "wavpack/taglib_wavpactdefiletyperesolver.h"
 #include "wavpack/wvfile.h"
 #include "speex/taglib_speexfiletyperesolver.h"
 #include "speex/speexfile.h"
diff --git a/amarok/src/metadata/wavpack/Makefile.am b/amarok/src/metadata/wavpack/Makefile.am
index 8a4c2d7a..9a6df253 100644
--- a/amarok/src/metadata/wavpack/Makefile.am
+++ b/amarok/src/metadata/wavpack/Makefile.am
@@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la
 libtagwavpack_la_SOURCES = \
                            wvfile.cpp \
                            wvproperties.cpp \
-                           taglib_wavpackfiletyperesolver.cpp
+                           taglib_wavpactdefiletyperesolver.cpp
 
 noinst_HEADERS =     wvfile.h \
                      wvproperties.h \
-                     taglib_wavpackfiletyperesolver.h
+                     taglib_wavpactdefiletyperesolver.h
 
diff --git a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
index fe289a27..feadd8b2 100644
--- a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp
+++ b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
@@ -19,7 +19,7 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include "taglib_wavpackfiletyperesolver.h"
+#include "taglib_wavpactdefiletyperesolver.h"
 #include "wvfile.h"
 
 #include <string.h>
diff --git a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
index b9d4500a..b9d4500a 100644
--- a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
+++ b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h
index 4ea86920..54cbe8bb 100644
--- a/amarok/src/mountpointmanager.h
+++ b/amarok/src/mountpointmanager.h
@@ -26,7 +26,7 @@
 #include "pluginmanager.h"
 #include "threadmanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqmap.h>
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 8a0c7a41..9f8a5013 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
diff --git a/amarok/src/mydirlister.h b/amarok/src/mydirlister.h
index eeb8c55a..389391fd 100644
--- a/amarok/src/mydirlister.h
+++ b/amarok/src/mydirlister.h
@@ -8,7 +8,7 @@
 #include "playlistloader.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class MyDirLister : public KDirLister {
 public:
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 371a0d2c..0c01c1de 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -71,7 +71,7 @@
 #include <kglobalsettings.h> //rename()
 #include <kiconeffect.h>
 #include <kiconloader.h>     //slotShowContextMenu()
-#include <kio/job.h>         //deleteSelectedFiles()
+#include <tdeio/job.h>         //deleteSelectedFiles()
 #include <klineedit.h>       //setCurrentTrack()
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 189b72a2..4ecdba3f 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -45,8 +45,8 @@
 #include <kactionclasses.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kfiledialog.h>       //openPlaylist()
-#include <kio/job.h>           //deleteSelectedPlaylists()
+#include <tdefiledialog.h>       //openPlaylist()
+#include <tdeio/job.h>           //deleteSelectedPlaylists()
 #include <kiconloader.h>       //smallIcon
 #include <kinputdialog.h>
 #include <klineedit.h>         //rename()
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 82b1bb22..13e43550 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -40,8 +40,8 @@
 #include <kapplication.h>      //Used for Shoutcast random name generation
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>       //smallIcon
-#include <kio/jobclasses.h>    //podcast retrieval
-#include <kio/job.h>           //podcast retrieval
+#include <tdeio/jobclasses.h>    //podcast retrieval
+#include <tdeio/job.h>           //podcast retrieval
 #include <klocale.h>
 #include <kmessagebox.h>       //podcast info box
 #include <kmimetype.h>
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index 376b8003..a37eabff 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -15,7 +15,7 @@
 #include "podcastsettings.h"
 
 #include <kdialogbase.h> // StreamEditor baseclass
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <kurl.h>
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index 75edfbb1..26eca7f4 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -39,7 +39,7 @@
 #include <tqrect.h>
 
 #include <tdeversion.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index 497d2e76..f05ed350 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -970,7 +970,7 @@ PlaylistFile::loadSMIL( TQTextStream &stream )
 /// @class RemotePlaylistFetcher
 
 #include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem *after, int options )
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 03cfc187..9bb693bb 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -57,7 +57,7 @@
 
 #include <kaction.h>          //m_actionCollection
 #include <kapplication.h>     //kapp
-#include <kfiledialog.h>      //savePlaylist(), openPlaylist()
+#include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
 #include <kglobal.h>
 #include <tdehtml_part.h>       //Welcome Tab
 #include <kiconloader.h>      //ClearFilter button
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 4e2d1f21..1b50ff74 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -25,7 +25,7 @@
 #include <tqstyle.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 
diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp
index 51ef48d7..4098b83d 100644
--- a/amarok/src/refreshimages.cpp
+++ b/amarok/src/refreshimages.cpp
@@ -17,9 +17,9 @@
 #include <tqvaluelist.h>
 #include <tqvariant.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <klocale.h>
 
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 30fcc75f..67e117f7 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -45,9 +45,9 @@
 
 #include <kaboutdialog.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 8039c9bc..553f1df2 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -24,8 +24,8 @@
 #include <tqdeepcopy.h>
 
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index afdd0fb1..b57bbcb1 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -27,7 +27,7 @@
 #include "threadmanager.h"
 #include "enginecontroller.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp
index d37de53a..514b6756 100644
--- a/amarok/src/tagguesser.cpp
+++ b/amarok/src/tagguesser.cpp
@@ -15,7 +15,7 @@
 #include "tagguesser.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmacroexpander.h>
 
diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp
index b5f258cf..e000bb93 100644
--- a/amarok/src/transferdialog.cpp
+++ b/amarok/src/transferdialog.cpp
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/doc/da/config.docbook b/doc/da/config.docbook
index 1ad39ffe..343541ca 100644
--- a/doc/da/config.docbook
+++ b/doc/da/config.docbook
@@ -459,7 +459,7 @@
 <para
 ><guilabel
 >Overvåg mappe for ændringer</guilabel
->: Tillader &amarok; at overvåge de markerede mapper for at finde ændringer i filsystemet (for eksempel tilføjede eller fjernede musikfiler). En partiel søgning udføres også for at udføre de nødvendige ændringer i din samling.</para>
+>: Tillader &amarok; at overvåge de markerede mapper for at finde ændringer i filsystemet (for eksempel tilføjede eller fjernede musitdefiler). En partiel søgning udføres også for at udføre de nødvendige ændringer i din samling.</para>
 <para
 ><guilabel
 >Importér spillelister</guilabel
diff --git a/doc/nl/faq.docbook b/doc/nl/faq.docbook
index 6826da3f..0da3fd18 100644
--- a/doc/nl/faq.docbook
+++ b/doc/nl/faq.docbook
@@ -892,7 +892,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&amp;UTF8
 >Plaats uw cd, en klik op de menuoptie "Audio-cd afspelen". De bestandsbrowser wordt dan geopend en toont een boomstructuur met meerdere mappen. Voor gewoon rippen, open de map "wav", selecteer enkele tracks en sleep ze naar de gewenste locatie in een Konqueror-venster. Voor automatische codering, sleep de bestanden uit de map "mp3" of "ogg".</para>
 <note
 ><para
->Voor het rippen van cd's is de kioslave "audiocd" nodig. Deze is onderdeel van KDE-Multimedia.</para
+>Voor het rippen van cd's is de tdeioslave "audiocd" nodig. Deze is onderdeel van KDE-Multimedia.</para
 ></note>
 </answer>
 </qandaentry>
diff --git a/doc/sv/config.docbook b/doc/sv/config.docbook
index aa716379..2127c671 100644
--- a/doc/sv/config.docbook
+++ b/doc/sv/config.docbook
@@ -459,7 +459,7 @@
 <para
 ><guilabel
 >Bevaka katalog efter ändringar</guilabel
->: Låter &amarok; bevaka markerade kataloger för att hitta ändringar i filsystemet (till exempel tillagda eller borttagna musikfiler). En partiell sökning utförs också för att göra nödvändiga ändringar i din samling.</para>
+>: Låter &amarok; bevaka markerade kataloger för att hitta ändringar i filsystemet (till exempel tillagda eller borttagna musitdefiler). En partiell sökning utförs också för att göra nödvändiga ändringar i din samling.</para>
 <para
 ><guilabel
 >Importera spellistor</guilabel
diff --git a/po/af/amarok.po b/po/af/amarok.po
index d4e133bb..2642dcb6 100644
--- a/po/af/amarok.po
+++ b/po/af/amarok.po
@@ -1009,7 +1009,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1022,7 +1022,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$./configure --prefix=`tde-config --prefix` && su -c \"make install\"br>"
-"$kbuildsycoca"
+"$tdebuildsycoca"
 "<br>$amaroK</pre>Verdere inligting kan in die README lêer gevind word. Vir meer "
 "bystand kan jy m.b.v. IRC by kamer #amarok op irc.freenode.net inskakel.</p>"
 
diff --git a/po/ar/amarok.po b/po/ar/amarok.po
index 542f3df5..172cc8c6 100644
--- a/po/ar/amarok.po
+++ b/po/ar/amarok.po
@@ -941,7 +941,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/az/amarok.po b/po/az/amarok.po
index b5c633c1..1e1d8bbe 100644
--- a/po/az/amarok.po
+++ b/po/az/amarok.po
@@ -979,7 +979,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/be/amarok.po b/po/be/amarok.po
index c36ce584..f201f8b8 100644
--- a/po/be/amarok.po
+++ b/po/be/amarok.po
@@ -926,7 +926,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/bg/amarok.po b/po/bg/amarok.po
index 12637dfe..f7e498c3 100644
--- a/po/bg/amarok.po
+++ b/po/bg/amarok.po
@@ -1002,7 +1002,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1013,7 +1013,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Повече информация може да бъде намерена във файла README. За "
 "повече помощ елате в #amarok в irc.freenode.net.</p>"
 
diff --git a/po/bn/amarok.po b/po/bn/amarok.po
index a697a955..a2e77ae5 100644
--- a/po/bn/amarok.po
+++ b/po/bn/amarok.po
@@ -986,7 +986,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/br/amarok.po b/po/br/amarok.po
index d6304b5c..f17f006b 100644
--- a/po/br/amarok.po
+++ b/po/br/amarok.po
@@ -950,7 +950,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/ca/amarok.po b/po/ca/amarok.po
index 80e81b98..a5adec04 100644
--- a/po/ca/amarok.po
+++ b/po/ca/amarok.po
@@ -1009,7 +1009,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1021,7 +1021,7 @@ msgstr ""
 "<pre>$ cd /ruta/al/codi-font/amarok/ "
 "<br>$ su -c \"make uninstall\" "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca "
+"<br>$ tdebuildsycoca "
 "<br>$ amarok </pre> Podeu trobar més informació al fitxer README. Per a més "
 "ajuda busqueu-nos al canal #amarok a irc.freenode.net.</p>"
 
diff --git a/po/cs/amarok.po b/po/cs/amarok.po
index e54fbff9..8478400b 100644
--- a/po/cs/amarok.po
+++ b/po/cs/amarok.po
@@ -951,7 +951,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -963,7 +963,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Více informací je možné nalézt v souboru README. Pro další "
 "pomoc se k nám připojte na #amarok na irc.freenode.net.</p>"
 
diff --git a/po/cy/amarok.po b/po/cy/amarok.po
index b4a9eb46..3e4822f6 100644
--- a/po/cy/amarok.po
+++ b/po/cy/amarok.po
@@ -972,7 +972,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/da/amarok.po b/po/da/amarok.po
index c07fed6c..664130b5 100644
--- a/po/da/amarok.po
+++ b/po/da/amarok.po
@@ -998,7 +998,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1008,7 +1008,7 @@ msgstr ""
 "under TDE's præfiks, ordn det venligst ved at bruge: "
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\" "
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\"</pre> "
 "Mere information kan findes i README-filen. For yderligere assistance gå "
 "venligst med i #amarok på irc.freenode.net."
@@ -7299,7 +7299,7 @@ msgid ""
 "<p>If you wish, Amarok is able to monitor these folders for new files and can "
 "automatically add them to the collection.</p>"
 msgstr ""
-"<p>Vælg mapperne hvor dine musikfiler er lagrede til højre.</p>\n"
+"<p>Vælg mapperne hvor dine musitdefiler er lagrede til højre.</p>\n"
 "<p>At gøre dette anbefales stærkt, eftersom det udvider de tilgængelige "
 "funktioner.</p>\n"
 "<p>Hvis du ønsker det, kan Amarok overvåge mapperne for nye filer og kan "
@@ -8672,7 +8672,7 @@ msgid ""
 "Enabling this option stores Mood data files with the music files. Disabling "
 "stores them in your home folder."
 msgstr ""
-"Aktiveres dette opbevares stemningsdatafiler sammen med musikfilerne. "
+"Aktiveres dette opbevares stemningsdatafiler sammen med musitdefilerne. "
 "Deaktiveres dette opbevares de i din hjemmemappe."
 
 #. i18n: file ./Options1.ui line 567
@@ -8683,7 +8683,7 @@ msgid ""
 "mood file for /music/file.mp3 will be /music/file.mood.  Disabling stores them "
 "in your home folder."
 msgstr ""
-"Ved at aktivere dette opbevares stemningsdatafiler med musikfilerne. Nærmere "
+"Ved at aktivere dette opbevares stemningsdatafiler med musitdefilerne. Nærmere "
 "bestemt kommer stemningsfilen for /musik/fil.mp3 til at være /musik/fil.mood. "
 "Deaktiveres det opbevares de i din hjemmemappe."
 
diff --git a/po/de/amarok.po b/po/de/amarok.po
index 9d84deb4..5ab1d190 100644
--- a/po/de/amarok.po
+++ b/po/de/amarok.po
@@ -1004,7 +1004,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1016,7 +1016,7 @@ msgstr ""
 "<pre>$ cd /pfad/zu/Amarok/Quellcode/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ Amarok</pre> "
 "<br>Bitte lesen Sie auch die README-Datei. Falls Sie weitere Hilfe benötigen, "
 "können Sie uns in #amarok auf irc.freenode.org besuchen."
diff --git a/po/el/amarok.po b/po/el/amarok.po
index 7e73e197..d31ad2a5 100644
--- a/po/el/amarok.po
+++ b/po/el/amarok.po
@@ -1008,7 +1008,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1020,7 +1020,7 @@ msgstr ""
 "<pre>$ cd /τόπος/του/κώδικα/του/AmaroK/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Περισσότερες πληροφορίες θα βρείτε στο αρχείο README. Για "
 "βοήθεια, συναντήστε μας στο #amarok στο irc.freenode.net.</p>"
 
diff --git a/po/en_GB/amarok.po b/po/en_GB/amarok.po
index 9acec154..8bc94b60 100644
--- a/po/en_GB/amarok.po
+++ b/po/en_GB/amarok.po
@@ -1013,7 +1013,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 
diff --git a/po/eo/amarok.po b/po/eo/amarok.po
index a6142b1f..507dfdb0 100644
--- a/po/eo/amarok.po
+++ b/po/eo/amarok.po
@@ -934,7 +934,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/es/amarok.po b/po/es/amarok.po
index bc15b38e..eb739a23 100644
--- a/po/es/amarok.po
+++ b/po/es/amarok.po
@@ -1007,7 +1007,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgstr ""
 "<pre>$ cd /ruta/al/codigo/fuente/de/amarok/ "
 "<br>$ su -c \"make uninstall\" "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca "
+"<br>$ tdebuildsycoca "
 "<br>$amaroK</pre>Puede encontrar mas información en el archivo README. Para más "
 "información contacte con nosotros en #amarok en irc.freenode.net.</p>"
 
diff --git a/po/et/amarok.po b/po/et/amarok.po
index cba77489..21592f9f 100644
--- a/po/et/amarok.po
+++ b/po/et/amarok.po
@@ -990,7 +990,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1002,7 +1002,7 @@ msgstr ""
 "<pre>$ cd /amaroki/lähtekoodi/asukoht/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Täpsemalt räägib sellest fail README. Vajadusel leiad abi ka "
 "meie suhtluskanalilt #amarok serveris irc.freenode.net."
 
diff --git a/po/eu/amarok.po b/po/eu/amarok.po
index cde46d2d..9c94deb9 100644
--- a/po/eu/amarok.po
+++ b/po/eu/amarok.po
@@ -979,7 +979,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -991,7 +991,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Xehetasun gehiago README fitxategian aurki dezakezu. Laguntza "
 "gehiagorako zoaz irc.freenode.net zerbitzariko #amarok kanalera.</p>"
 
diff --git a/po/fa/amarok.po b/po/fa/amarok.po
index 505dda7e..be53de85 100644
--- a/po/fa/amarok.po
+++ b/po/fa/amarok.po
@@ -985,7 +985,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c »نصب« "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c »عدم نصب« "
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>بررسی کنید. اطلاعات بیشتر را می‌توان در پروندۀ README یافت. "
 "برای همکاری بیشتر در #amarok on irc.freenode.net به ما بپیوندید.</p>"
 
diff --git a/po/fi/amarok.po b/po/fi/amarok.po
index 39888545..bb1de7e2 100644
--- a/po/fi/amarok.po
+++ b/po/fi/amarok.po
@@ -1021,7 +1021,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1033,7 +1033,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Lisätietoja on README-tiedostossa. Lisäapua saa IRC-kanavalla "
 "#amarok (irc.freenode.net).</p>"
 
diff --git a/po/fr/amarok.po b/po/fr/amarok.po
index 5e025445..aed5acfa 100644
--- a/po/fr/amarok.po
+++ b/po/fr/amarok.po
@@ -1022,7 +1022,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1035,7 +1035,7 @@ msgstr ""
 "<pre>$ cd /chemin vers/le dossier contenant/le code source/d'Amarok/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Vous pouvez trouver plus d'informations dans le fichier "
 "« README ». Pour plus d'aide, rejoignez-nous sur #amarok sur "
 "irc.freenode.net.</p>"
diff --git a/po/ga/amarok.po b/po/ga/amarok.po
index cbaefa86..9d172ca4 100644
--- a/po/ga/amarok.po
+++ b/po/ga/amarok.po
@@ -957,7 +957,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/gl/amarok.po b/po/gl/amarok.po
index cb4316b1..39a3803c 100644
--- a/po/gl/amarok.po
+++ b/po/gl/amarok.po
@@ -993,7 +993,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
 "<pre>$ cd /rota/para/amarok/código-fonte/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Pódese atopar máis información no ficheiro README. Para axuda "
 "adicional, pode recorrer á canle #amarok en irc.freenode.net.</p>"
 
diff --git a/po/he/amarok.po b/po/he/amarok.po
index 928d72df..bd45bc03 100644
--- a/po/he/amarok.po
+++ b/po/he/amarok.po
@@ -973,7 +973,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -984,7 +984,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/ "
 "<br>$ su -c \"make uninstall\" "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca "
+"<br>$ tdebuildsycoca "
 "<br>$ amarok</pre> מידע נוסף נמצא בקובץ README. לעזרה נוספת, הצטרף אלינו בערוץ "
 "amarok# ב־irc.freenode.net. </p>"
 
diff --git a/po/hi/amarok.po b/po/hi/amarok.po
index f7dd110b..c833e339 100644
--- a/po/hi/amarok.po
+++ b/po/hi/amarok.po
@@ -986,7 +986,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/hu/amarok.po b/po/hu/amarok.po
index cf67d6ef..240356df 100644
--- a/po/hu/amarok.po
+++ b/po/hu/amarok.po
@@ -983,7 +983,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -995,7 +995,7 @@ msgstr ""
 "<pre>$ cd /az/amarok/forráskódja/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>További információ található a README fájlban. Szívesen adunk "
 "segítséget IRC-n az #amarok csatornán, az irc.freenode.net címen.</p>"
 
diff --git a/po/id/amarok.po b/po/id/amarok.po
index b130f2d5..ef13f707 100644
--- a/po/id/amarok.po
+++ b/po/id/amarok.po
@@ -945,7 +945,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/is/amarok.po b/po/is/amarok.po
index 9173b742..f12985a4 100644
--- a/po/is/amarok.po
+++ b/po/is/amarok.po
@@ -974,7 +974,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -986,7 +986,7 @@ msgstr ""
 "<pre>$ cd /slóð/að/amarok/kóðanum/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> Nánari lýsingu má finna í README skránni. Ef þú þarft meiri "
 "hjálp getur þú fundið okkur á #amarok á irc.freenode.net.</p>"
 
diff --git a/po/it/amarok.po b/po/it/amarok.po
index 2e15b10f..0a0ebb49 100644
--- a/po/it/amarok.po
+++ b/po/it/amarok.po
@@ -1001,7 +1001,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1013,7 +1013,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Ulteriori informazioni possono essere trovate nel file "
 "README. Per assistenza puoi trovarci in #amarok su irc.freenode.net.</p>"
 
diff --git a/po/ja/amarok.po b/po/ja/amarok.po
index 2f7a2be5..babd958e 100644
--- a/po/ja/amarok.po
+++ b/po/ja/amarok.po
@@ -938,7 +938,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -948,7 +948,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>詳しくは README ファイルをご覧ください。それでも解決しない場合は irc.freenode.net 上の "
 "#amarok へお越しください。"
 
diff --git a/po/ka/amarok.po b/po/ka/amarok.po
index 38766413..0d23d08e 100644
--- a/po/ka/amarok.po
+++ b/po/ka/amarok.po
@@ -968,7 +968,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/km/amarok.po b/po/km/amarok.po
index 413c989f..c273c256 100644
--- a/po/km/amarok.po
+++ b/po/km/amarok.po
@@ -984,7 +984,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -997,7 +997,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>​ព័ត៌មាន​បន្ថែម​អាច​រក​បាន​នៅ​ក្នុង​ឯកសារ README ។ "
 "សម្រាប់​ជំនួយ​បន្ថែម សូម​ចូលរួម​ជា​មួយ​យើងនៅ #amarok នៅ​លើ "
 "irc.freenode.net ។</p>"
diff --git a/po/ko/amarok.po b/po/ko/amarok.po
index 128df29e..bcd2d412 100644
--- a/po/ko/amarok.po
+++ b/po/ko/amarok.po
@@ -972,7 +972,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -982,7 +982,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>더 많은 정보는 README 파일을 참조하십시오. 앞으로도 문제가 있으면 irc.freenode.net의 "
 "#amarok 채널에 참여하시기 바랍니다."
 
diff --git a/po/ku/amarok.po b/po/ku/amarok.po
index 6fc7ac51..11b64deb 100644
--- a/po/ku/amarok.po
+++ b/po/ku/amarok.po
@@ -935,7 +935,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/lo/amarok.po b/po/lo/amarok.po
index 1745a02d..0d8d48e4 100644
--- a/po/lo/amarok.po
+++ b/po/lo/amarok.po
@@ -979,7 +979,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -988,7 +988,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>더 많은 정보는 README 파일을 참조하십시오. 앞으로도 문제가 있으면 irc.freenode.net의 "
 "#amarok 채널에 참여하시기 바랍니다."
 
diff --git a/po/lt/amarok.po b/po/lt/amarok.po
index 4e376bc9..6233c8ed 100644
--- a/po/lt/amarok.po
+++ b/po/lt/amarok.po
@@ -996,7 +996,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1008,7 +1008,7 @@ msgstr ""
 "<pre>$ cd /kelias/iki/amarok/šaltinių/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Daugiau informacijos galite rasti README byloje. Papildomą "
 "pagalbą galite gauti prisijungę prie #amarok kanalo irc.freenode.net "
 "serveryje.</p>"
diff --git a/po/mk/amarok.po b/po/mk/amarok.po
index 87632e96..634969af 100644
--- a/po/mk/amarok.po
+++ b/po/mk/amarok.po
@@ -983,7 +983,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -995,7 +995,7 @@ msgstr ""
 "<pre>$ cd /pateka/do/izvoren-kod/na/amarok/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Повеќе информации можат да бидат најдени во датотеката "
 "README. За понатамошна помош приклучете се на #amarok на irc.freenode.net.</p>"
 
diff --git a/po/ms/amarok.po b/po/ms/amarok.po
index 57a5a75f..2f5a1894 100644
--- a/po/ms/amarok.po
+++ b/po/ms/amarok.po
@@ -1014,7 +1014,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/nb/amarok.po b/po/nb/amarok.po
index 55cc4e64..2bd03bc5 100644
--- a/po/nb/amarok.po
+++ b/po/nb/amarok.po
@@ -1001,7 +1001,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1012,7 +1012,7 @@ msgstr ""
 "<pre>$ cd /adresse/til/amarok-kildekoden/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Du finner mer informasjon i fila «README». Du kan også få "
 "hjelp på IRC-kanalen #amarok på irc.freenode.net.</p>"
 
@@ -7292,7 +7292,7 @@ msgid ""
 "<p>If you wish, Amarok is able to monitor these folders for new files and can "
 "automatically add them to the collection.</p>"
 msgstr ""
-"<p>Velg hvilke mapper blant de til høyre som inneholder musikkfilene dine.</p>\n"
+"<p>Velg hvilke mapper blant de til høyre som inneholder musiktdefilene dine.</p>\n"
 "<p>Dette er anbefalt på det sterkeste og vil forbedre funksjonene du "
 "hartilgjengelige.</p>\n"
 "<p>Hvis du vil kan Amarok overvåke disse mappene for å finne nye filer og "
@@ -8669,7 +8669,7 @@ msgid ""
 "Enabling this option stores Mood data files with the music files. Disabling "
 "stores them in your home folder."
 msgstr ""
-"Hvis dette er slått på blir filer med stemningsdata lagret med musikkfilene, "
+"Hvis dette er slått på blir filer med stemningsdata lagret med musiktdefilene, "
 "ellers blir de lagret i din hjemmemappe."
 
 #. i18n: file ./Options1.ui line 567
@@ -8681,7 +8681,7 @@ msgid ""
 "in your home folder."
 msgstr ""
 "Hvis dette er slått på blir filene med stemningsdata lagret sammen med "
-"musikkfilene.  Stemningsfila for /musikk/fil.mp3 blir /musikk/fil.mood.  Er det "
+"musiktdefilene.  Stemningsfila for /musikk/fil.mp3 blir /musikk/fil.mood.  Er det "
 "slått av, så lagres .mood-filene i din hjemmemappe."
 
 #. i18n: file ./Options1.ui line 584
@@ -12295,7 +12295,7 @@ msgstr ""
 "<h3>Oversiktene</h3>Oversiktene er kildene til all musikken din. "
 "Samlingoversikten inneholder hele samlingen, spillelisteoversikten inneholder "
 "ferdiglagede spillelister og filoversikten viser en filvelger som gir deg "
-"tilgang til alle musikkfilene på datamaskinen. </div>"
+"tilgang til alle musiktdefilene på datamaskinen. </div>"
 
 #: playlist.cpp:2740
 #, c-format
diff --git a/po/nds/amarok.po b/po/nds/amarok.po
index 6818a929..8598c827 100644
--- a/po/nds/amarok.po
+++ b/po/nds/amarok.po
@@ -997,7 +997,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1008,7 +1008,7 @@ msgstr ""
 "<pre>$ cd /Padd/na/amarok/Bornkode/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Mehr Informaschonen staht binnen de Datei \"README\". Bruukst "
 "Du mehr Ünnerstütten, draap uns binnen #amarok op irc.freenode.net.</p>"
 
diff --git a/po/ne/amarok.po b/po/ne/amarok.po
index f2b4db6b..eed5cf80 100644
--- a/po/ne/amarok.po
+++ b/po/ne/amarok.po
@@ -1008,7 +1008,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok </pre>प्रयोग गरेर तपाईँको स्थापना निश्चित गर्नुहोस् । धेरै "
 "सूचनाहरू README फाइलमा फेला पार्न सकिन्छ । अगाडि सहयोगका लागि हामीसँग "
 "irc.freenode.net भित्र #amarok मा जडान हुनुहोस् ।</p>"
diff --git a/po/nl/amarok.po b/po/nl/amarok.po
index 0299d1c9..06cda36b 100644
--- a/po/nl/amarok.po
+++ b/po/nl/amarok.po
@@ -1008,7 +1008,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1020,7 +1020,7 @@ msgstr ""
 "<pre>$ cd /pad/naar/amarok/broncode/ "
 "<br>$ su -c \"make uninstall\" "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca "
+"<br>$ tdebuildsycoca "
 "<br>$ amarok</pre> Meer informatie vindt u in het bestand README. Voor verdere "
 "assistentie, word lid van het IRC-kanaal #amarok op irc.freenode.net.</p>"
 
diff --git a/po/nn/amarok.po b/po/nn/amarok.po
index 2ba71f90..8879450e 100644
--- a/po/nn/amarok.po
+++ b/po/nn/amarok.po
@@ -991,7 +991,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1002,7 +1002,7 @@ msgstr ""
 "<pre>$ cd /adresse/til/amarok-kjeldekoden/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Du finn meir informasjon i fila «README». Du kan òg få hjelp "
 "på IRC-kanalen #amarok på irc.freenode.net.</p>"
 
@@ -8633,7 +8633,7 @@ msgid ""
 "Enabling this option stores Mood data files with the music files. Disabling "
 "stores them in your home folder."
 msgstr ""
-"Lagra stemningsdatafilene saman med musikkfilene. Slår du av dette, vert dei "
+"Lagra stemningsdatafilene saman med musiktdefilene. Slår du av dette, vert dei "
 "lagra i heimemappa."
 
 #. i18n: file ./Options1.ui line 567
@@ -8644,7 +8644,7 @@ msgid ""
 "mood file for /music/file.mp3 will be /music/file.mood.  Disabling stores them "
 "in your home folder."
 msgstr ""
-"Lagra stemningsdatafilene saman med musikkfilene. Stemningsfila for "
+"Lagra stemningsdatafilene saman med musiktdefilene. Stemningsfila for "
 "«/musikk/fil.mp3» vert «/musikk/fil.mood». Slår du av dette, vert dei lagra i "
 "heimemappa."
 
@@ -12250,7 +12250,7 @@ msgstr ""
 "<div align=center>"
 "<h3>Sporoversiktene</h3>I sporoversiktene til venstre finn du all musikken din. "
 "Samlingoversikta inneheld heile samlinga, spelelisteoversikta inneheld "
-"ferdiglaga spelelister og filoversikta gjev deg tilgang til alle musikkfilene "
+"ferdiglaga spelelister og filoversikta gjev deg tilgang til alle musiktdefilene "
 "på datamaskina. </div>"
 
 #: playlist.cpp:2740
diff --git a/po/pa/amarok.po b/po/pa/amarok.po
index 1c48515e..4b0b9253 100644
--- a/po/pa/amarok.po
+++ b/po/pa/amarok.po
@@ -949,7 +949,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -961,7 +961,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>ਹੋਰ ਜਾਣਕਾਰੀ ਨੂੰ README ਫਾਇਲ ਵਿੱਚ ਵੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਵਧੇਰੇ "
 "ਜਾਣਕਾਰੀ ਲਈ irc.freenode.net ਉੱਤੇ #amarok ਨੂੰ ਵੇਖੋ।</p>"
 
diff --git a/po/pl/amarok.po b/po/pl/amarok.po
index b778e3b4..b0c15f3a 100644
--- a/po/pl/amarok.po
+++ b/po/pl/amarok.po
@@ -1017,7 +1017,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgstr ""
 "<pre>$ cd /ścieżka/do/kodu_źródłowego/amaroka/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Więcej informacji można uzyskać w pliku README. W celu "
 "uzyskania dalszej pomocy odwiedź kanał #amarok na serwerze irc.freenode.net.</p>"
 
diff --git a/po/pt/amarok.po b/po/pt/amarok.po
index a343dbf4..083ee34e 100644
--- a/po/pt/amarok.po
+++ b/po/pt/amarok.po
@@ -61,7 +61,7 @@ msgstr ""
 "X-POFile-SpellExtra: Oldfield Amp Shuffle GenericMediaDeviceConfigDialog\n"
 "X-POFile-SpellExtra: AmaroK vs VIDEOHOSTS install Open iFTP and USD TagLib\n"
 "X-POFile-SpellExtra: ktrm SinkHostName FHT hydrogen AUDIOHOSTS Firefly\n"
-"X-POFile-SpellExtra: berkus track MTP sven Howell The Ímane kbuildsycoca\n"
+"X-POFile-SpellExtra: berkus track MTP sven Howell The Ímane tdebuildsycoca\n"
 "X-POFile-SpellExtra: eject Kretschmann Deep or HyperThreading sh URLS the\n"
 "X-POFile-SpellExtra: KLibLoader portatil sebr eean Device SysInfo sysinfo\n"
 "X-POFile-SpellExtra: iPodControl\n"
@@ -1053,7 +1053,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1063,7 +1063,7 @@ msgstr ""
 "<pre>$ cd /local/do/codigo-fonte/amarok"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Pode encontrar mais informações no ficheiro README. Para mais "
 "ajuda junte-se a nós em #amarok no irc.freenode.net.</p>"
 
diff --git a/po/pt_BR/amarok.po b/po/pt_BR/amarok.po
index 74b14d00..e595a771 100644
--- a/po/pt_BR/amarok.po
+++ b/po/pt_BR/amarok.po
@@ -1016,7 +1016,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1028,7 +1028,7 @@ msgstr ""
 "<pre>$ cd /caminho/do/código-fonte/do/amarok/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Mais informações podem ser encontradas no arquivo README. "
 "Para tirar outras dúvidas, dê um pulo no canal #amarok em irc.freenode.net.</p>"
 
diff --git a/po/ro/amarok.po b/po/ro/amarok.po
index 5de75d4b..364e329c 100644
--- a/po/ro/amarok.po
+++ b/po/ro/amarok.po
@@ -989,7 +989,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/ru/amarok.po b/po/ru/amarok.po
index 65f6424d..e5b6962e 100644
--- a/po/ru/amarok.po
+++ b/po/ru/amarok.po
@@ -984,7 +984,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -994,7 +994,7 @@ msgstr ""
 "<pre>cd /path/to/amarok/source-code/"
 "<br>su -c \"make uninstall\""
 "<br>./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Для подробностей обратитесь к файлу README, либо попросите "
 "помощь у участников канала #amarok на irc.freenode.net."
 
diff --git a/po/rw/amarok.po b/po/rw/amarok.po
index b18ab0f0..c8282030 100644
--- a/po/rw/amarok.po
+++ b/po/rw/amarok.po
@@ -1019,7 +1019,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr "<p>net."
diff --git a/po/se/amarok.po b/po/se/amarok.po
index 2cf64dc9..6abf1b57 100644
--- a/po/se/amarok.po
+++ b/po/se/amarok.po
@@ -963,7 +963,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -974,7 +974,7 @@ msgstr ""
 "<pre> $ cd /amarok/gáldokoda/čujuhus/"
 "<br>$ su -c \"make uninstall\" "
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
-"<br>$ kbuildsycoca "
+"<br>$ tdebuildsycoca "
 "<br>$ amarok</pre> Gávnnat eanet dieđuid «README»-fiillas. Sáhtát maid oažžut "
 "veahki IRC-kanálas #amarok irc.freenode.net:as</p>"
 
diff --git a/po/sk/amarok.po b/po/sk/amarok.po
index 1d5ff8d2..235ea537 100644
--- a/po/sk/amarok.po
+++ b/po/sk/amarok.po
@@ -1011,7 +1011,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1023,7 +1023,7 @@ msgstr ""
 "<pre>$ cd /cesta/ku/zdrojovym/suborom/amaroku/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Viac informácii je možné nájsť v súbore README. Pre ďalšiu "
 "pomoc sa k nám pripojte na #amarok na irc.freenode.net.</p>"
 
diff --git a/po/sl/amarok.po b/po/sl/amarok.po
index c58bf7a2..ea6cf78a 100644
--- a/po/sl/amarok.po
+++ b/po/sl/amarok.po
@@ -1008,7 +1008,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1020,7 +1020,7 @@ msgstr ""
 "<pre>$ cd /pot/do/izvorne-kode/amaroka/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Več informacij najdete v datoteki README. Za dodatno pomoč se "
 "nam pridužite na kanalu #amarok na strežniku irc.freenode.net.</p>"
 
diff --git a/po/sq/amarok.po b/po/sq/amarok.po
index 1dab1279..90535d4c 100644
--- a/po/sq/amarok.po
+++ b/po/sq/amarok.po
@@ -961,7 +961,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/sr/amarok.po b/po/sr/amarok.po
index 10a1d5bc..65f6faea 100644
--- a/po/sr/amarok.po
+++ b/po/sr/amarok.po
@@ -1006,7 +1006,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1018,7 +1018,7 @@ msgstr ""
 "<pre>$ cd /putanja/do/amarokovog/izvornog-koda/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> Више информација можете наћи у фајлу README. За даљу помоћ "
 "придружите нам се на #amarok на irc.freenode.net .</p>"
 
diff --git a/po/sr@Latn/amarok.po b/po/sr@Latn/amarok.po
index 995edb2b..614697e3 100644
--- a/po/sr@Latn/amarok.po
+++ b/po/sr@Latn/amarok.po
@@ -1006,7 +1006,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1018,7 +1018,7 @@ msgstr ""
 "<pre>$ cd /putanja/do/amarokovog/izvornog-koda/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> Više informacija možete naći u fajlu README. Za dalju pomoć "
 "pridružite nam se na #amarok na irc.freenode.net .</p>"
 
diff --git a/po/ss/amarok.po b/po/ss/amarok.po
index a5027815..77112bdf 100644
--- a/po/ss/amarok.po
+++ b/po/ss/amarok.po
@@ -980,7 +980,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -992,7 +992,7 @@ msgstr ""
 "<pre>$ cd /putanja/do/amarokovog/izvornog-koda/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> Više informacija možete naći u fajlu README. Za dalju pomoć "
 "pridružite nam se na #amarok na irc.freenode.net -u.</p>"
 
diff --git a/po/sv/amarok.po b/po/sv/amarok.po
index 38e8b516..8d00963b 100644
--- a/po/sv/amarok.po
+++ b/po/sv/amarok.po
@@ -999,7 +999,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1011,7 +1011,7 @@ msgstr ""
 "<pre>$ cd /sökväg/till/amaroks/källkod"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$amarok</pre> Mer information finns i filen README. För ytterligare hjälp "
 "kontakta oss gärna via #amarok på irc.freenode.net.</p>"
 
@@ -7292,7 +7292,7 @@ msgid ""
 "<p>If you wish, Amarok is able to monitor these folders for new files and can "
 "automatically add them to the collection.</p>"
 msgstr ""
-"<p>Välj katalogerna där dina musikfiler är lagrade till höger.</p>\n"
+"<p>Välj katalogerna där dina musitdefiler är lagrade till höger.</p>\n"
 "<p>Att göra det rekommenderas starkt, eftersom det utökar de tillgängliga "
 "funktionerna.</p>\n"
 "<p>Om du önskar, kan Amarok bevaka katalogerna efter nya filer och kan "
@@ -8671,7 +8671,7 @@ msgid ""
 "Enabling this option stores Mood data files with the music files. Disabling "
 "stores them in your home folder."
 msgstr ""
-"Genom att aktivera alternativet lagras stämningsdatafiler med musikfilerna. "
+"Genom att aktivera alternativet lagras stämningsdatafiler med musitdefilerna. "
 "Inaktiveras det lagras de i din hemkatalog."
 
 #. i18n: file ./Options1.ui line 567
@@ -8682,7 +8682,7 @@ msgid ""
 "mood file for /music/file.mp3 will be /music/file.mood.  Disabling stores them "
 "in your home folder."
 msgstr ""
-"Genom att aktivera alternativet lagras stämningsdatafiler med musikfilerna. "
+"Genom att aktivera alternativet lagras stämningsdatafiler med musitdefilerna. "
 "Närmare bestämt kommer stämningsfilen för /musik/fil.mp3 att vara "
 "/musik/fil.mood. Inaktiveras det lagras de i din hemkatalog."
 
diff --git a/po/ta/amarok.po b/po/ta/amarok.po
index b67b76fd..f6768a7e 100644
--- a/po/ta/amarok.po
+++ b/po/ta/amarok.po
@@ -1007,7 +1007,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/tg/amarok.po b/po/tg/amarok.po
index fa9bcd23..a9943bc7 100644
--- a/po/tg/amarok.po
+++ b/po/tg/amarok.po
@@ -1004,7 +1004,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1013,7 +1013,7 @@ msgstr ""
 "<pre>$ cd /роҳча/ба/amarok/манбаи-код/"
 "<br>$ su -c \"эҷоди бетанзим\""
 "<br>$ ./танзими --префикс=`kde-танзим --префикс` && su -c \"эҷоди танзим\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>"
 
 #: enginecontroller.cpp:264
diff --git a/po/th/amarok.po b/po/th/amarok.po
index 939b0e3a..42b6300d 100644
--- a/po/th/amarok.po
+++ b/po/th/amarok.po
@@ -977,7 +977,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -989,7 +989,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> สำหรับข้อมูลเพิ่มเติม คุณสามารถหาอ่านได้ในแฟ้ม README "
 "หากต้องการความช่วยเหลือมากกว่านี้ เชิญเข้าร่วมคุยกับเราได้ที่ห้อง #amarok ใน "
 "irc.freenode.net</p>"
diff --git a/po/tr/amarok.po b/po/tr/amarok.po
index e36ec5e3..fc5127bf 100644
--- a/po/tr/amarok.po
+++ b/po/tr/amarok.po
@@ -948,7 +948,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -960,7 +960,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre> Daha fazla bilgi README dosyasından bulunabilir. Daha fazla "
 "yardım için irc.freenode.net'te #amarok'a gelin ve bize katılın.</p>"
 
diff --git a/po/uk/amarok.po b/po/uk/amarok.po
index b70538af..af7824b2 100644
--- a/po/uk/amarok.po
+++ b/po/uk/amarok.po
@@ -1005,7 +1005,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -1017,7 +1017,7 @@ msgstr ""
 "<pre>$ cd /шлях/до/сирців/amarok/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>Більше інформації можна знайти у файлі README або у каналі "
 "#amarok на irc.freenode.net.</p>"
 
diff --git a/po/uz/amarok.po b/po/uz/amarok.po
index cea9d5cd..fa2fa7b6 100644
--- a/po/uz/amarok.po
+++ b/po/uz/amarok.po
@@ -936,7 +936,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/uz@cyrillic/amarok.po b/po/uz@cyrillic/amarok.po
index 01afd2d7..a2763a85 100644
--- a/po/uz@cyrillic/amarok.po
+++ b/po/uz@cyrillic/amarok.po
@@ -936,7 +936,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
diff --git a/po/zh_CN/amarok.po b/po/zh_CN/amarok.po
index 4d96036d..315d5c8e 100644
--- a/po/zh_CN/amarok.po
+++ b/po/zh_CN/amarok.po
@@ -925,7 +925,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -934,7 +934,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>更多信息可在 README 文件中找到。有关更进一步的协助，请加入 irc.freenode.net 上的 "
 "#amarok。"
 
diff --git a/po/zh_TW/amarok.po b/po/zh_TW/amarok.po
index ed41810d..7ff96678 100644
--- a/po/zh_TW/amarok.po
+++ b/po/zh_TW/amarok.po
@@ -951,7 +951,7 @@ msgid ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>More information can be found in the README file. For further "
 "assistance join us at #amarok on irc.freenode.net.</p>"
 msgstr ""
@@ -960,7 +960,7 @@ msgstr ""
 "<pre>$ cd /path/to/amarok/source-code/"
 "<br>$ su -c \"make uninstall\""
 "<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
-"<br>$ kbuildsycoca"
+"<br>$ tdebuildsycoca"
 "<br>$ amarok</pre>您也能在 README 中找到更多資訊。若需要更深入的幫助，請加入我們位於 irc.freenode.net 的 IRC "
 "頻道 #amarok。</p>"