Rename ksocket and kcache

11 files changed, 88 insertions, 88 deletions

diff --git a/tde-i18n-en_GB/configure b/tde-i18n-en_GB/configure
index 4923ea2a168..03163a3e343 100755
--- a/tde-i18n-en_GB/configure
+++ b/tde-i18n-en_GB/configure
@@ -4375,7 +4375,7 @@ ac_config_files="$ac_config_files docs/tdesdk/kbabel/Makefile"
 
 ac_config_files="$ac_config_files docs/tdesdk/kbugbuster/Makefile"
 
-ac_config_files="$ac_config_files docs/tdesdk/kcachegrind/Makefile"
+ac_config_files="$ac_config_files docs/tdesdk/tdecachegrind/Makefile"
 
 ac_config_files="$ac_config_files docs/tdesdk/kompare/Makefile"
 
@@ -5117,7 +5117,7 @@ do
     "docs/tdesdk/cervisia/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/cervisia/Makefile" ;;
     "docs/tdesdk/kbabel/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/kbabel/Makefile" ;;
     "docs/tdesdk/kbugbuster/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/kbugbuster/Makefile" ;;
-    "docs/tdesdk/kcachegrind/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/kcachegrind/Makefile" ;;
+    "docs/tdesdk/tdecachegrind/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/tdecachegrind/Makefile" ;;
     "docs/tdesdk/kompare/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/kompare/Makefile" ;;
     "docs/tdesdk/umbrello/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdesdk/umbrello/Makefile" ;;
     "docs/tdeutils/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tdeutils/Makefile" ;;
diff --git a/tde-i18n-en_GB/configure.in b/tde-i18n-en_GB/configure.in
index 2c91ea85d94..f82291f60bc 100644
--- a/tde-i18n-en_GB/configure.in
+++ b/tde-i18n-en_GB/configure.in
@@ -141,7 +141,7 @@ AC_CONFIG_FILES([ docs/tdesdk/Makefile ])
 AC_CONFIG_FILES([ docs/tdesdk/cervisia/Makefile ])
 AC_CONFIG_FILES([ docs/tdesdk/kbabel/Makefile ])
 AC_CONFIG_FILES([ docs/tdesdk/kbugbuster/Makefile ])
-AC_CONFIG_FILES([ docs/tdesdk/kcachegrind/Makefile ])
+AC_CONFIG_FILES([ docs/tdesdk/tdecachegrind/Makefile ])
 AC_CONFIG_FILES([ docs/tdesdk/kompare/Makefile ])
 AC_CONFIG_FILES([ docs/tdesdk/umbrello/Makefile ])
 AC_CONFIG_FILES([ docs/tdeutils/Makefile ])
diff --git a/tde-i18n-en_GB/docs/tdebase/faq/install.docbook b/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
index 81140524c33..ba030de6701 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/install.docbook
@@ -936,7 +936,7 @@ export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
 <listitem
 ><para
 ><filename
->/tmp/ksocket-<replaceable
+>/tmp/tdesocket-<replaceable
 >USER</replaceable
 ></filename
 ></para
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/faq/install.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/faq/install.docbook
index 81140524c33..ba030de6701 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/faq/install.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/faq/install.docbook
@@ -936,7 +936,7 @@ export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
 <listitem
 ><para
 ><filename
->/tmp/ksocket-<replaceable
+>/tmp/tdesocket-<replaceable
 >USER</replaceable
 ></filename
 ></para
diff --git a/tde-i18n-en_GB/docs/tdesdk/Makefile.in b/tde-i18n-en_GB/docs/tdesdk/Makefile.in
index 4adc695f442..2fb3b1fe455 100644
--- a/tde-i18n-en_GB/docs/tdesdk/Makefile.in
+++ b/tde-i18n-en_GB/docs/tdesdk/Makefile.in
@@ -187,7 +187,7 @@ xdg_menudir = @xdg_menudir@
 KDE_LANG = en_GB
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
-SUBDIRS =. umbrello kbabel kompare kbugbuster cervisia kcachegrind
+SUBDIRS =. umbrello kbabel kompare kbugbuster cervisia tdecachegrind
 KDE_DOCS = AUTO
 KDE_MANS = AUTO
 #>- all: all-recursive
diff --git a/tde-i18n-en_GB/docs/tdesdk/kcachegrind/Makefile.in b/tde-i18n-en_GB/docs/tdesdk/kcachegrind/Makefile.in
index bf11c55712d..975f7cf1331 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kcachegrind/Makefile.in
+++ b/tde-i18n-en_GB/docs/tdesdk/kcachegrind/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/tdesdk/kcachegrind
+subdir = docs/tdesdk/tdecachegrind
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -216,10 +216,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdesdk/kcachegrind/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdesdk/tdecachegrind/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -534,19 +534,19 @@ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
 docs-am: index.cache.bz2
 
 install-docs: docs-am install-nls
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind
 	@if test -f index.cache.bz2; then \
-	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/; \
-	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/; \
+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/; \
+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/; \
 	elif test -f  $(srcdir)/index.cache.bz2; then \
-	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/; \
-	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/; \
+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/; \
+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/; \
 	fi
-	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/common
+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/common
+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/common
 
 uninstall-docs:
-	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind
+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind
 
 clean-docs:
 	-rm -f index.cache.bz2
@@ -554,15 +554,15 @@ clean-docs:
 
 #>+ 13
 install-nls:
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind
 	@for base in index.docbook ; do \
-	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/$$base ;\
-	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/$$base ;\
+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/$$base ;\
+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/$$base ;\
 	done
 
 uninstall-nls:
 	for base in index.docbook ; do \
-	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcachegrind/$$base ;\
+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdecachegrind/$$base ;\
 	done
 
 
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/tdesdk/kcachegrind/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdesdk/kcachegrind/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdesdk/tdecachegrind/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdesdk/tdecachegrind/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-en_GB/docs/tdesdk/kcachegrind/index.docbook b/tde-i18n-en_GB/docs/tdesdk/kcachegrind/index.docbook
index 71ff8f42cef..443be3d40cd 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kcachegrind/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kcachegrind/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kcachegrind '<application
+  <!ENTITY tdecachegrind '<application
 >KCachegrind</application
 >'>
   <!ENTITY cachegrind "<application
@@ -18,7 +18,7 @@
   <!ENTITY oprofile "<application
 >OProfile</application
 >">
-  <!ENTITY kappname "&kcachegrind;">
+  <!ENTITY kappname "&tdecachegrind;">
   <!ENTITY package "tdesdk">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % British-English "INCLUDE">
@@ -30,7 +30,7 @@
 
 <bookinfo>
 <title
->The &kcachegrind; Handbook</title>
+>The &tdecachegrind; Handbook</title>
 
 <authorgroup>
 <author
@@ -80,7 +80,7 @@
 
 <abstract>
 <para
->&kcachegrind; is a profile data visualisation tool, written using the &kde; environment. </para>
+>&tdecachegrind; is a profile data visualisation tool, written using the &kde; environment. </para>
 </abstract>
 
 <keywordset>
@@ -197,24 +197,24 @@
 </sect1>
 </chapter>
 
-<chapter id="using-kcachegrind">
+<chapter id="using-tdecachegrind">
 <title
->Using &kcachegrind;</title>
+>Using &tdecachegrind;</title>
 
 <sect1 id="using-profile">
 <title
 >Generate Data to Visualise</title>
 
 <para
->First, one wants to generate performance data by measuring aspects of the runtime characteristics of an application, using a profiling tool. &kcachegrind; itself does not include any profiling tool, but is good in being used together with &callgrind;, and by using a converter, also can be used to visualise data produced with &oprofile;. Although the scope of this manual is not to document profiling with these tools, the next section provides short quickstart tutorials to get you started. </para>
+>First, one wants to generate performance data by measuring aspects of the runtime characteristics of an application, using a profiling tool. &tdecachegrind; itself does not include any profiling tool, but is good in being used together with &callgrind;, and by using a converter, also can be used to visualise data produced with &oprofile;. Although the scope of this manual is not to document profiling with these tools, the next section provides short quickstart tutorials to get you started. </para>
 
 <sect2>
 <title
 >&callgrind;</title>
 
 <para
->&callgrind; is available from <ulink url="http://kcachegrind.sf.net"
-> http://kcachegrind.sf.net</ulink
+>&callgrind; is available from <ulink url="http://tdecachegrind.sf.net"
+> http://tdecachegrind.sf.net</ulink
 >. Note that it previously was called &calltree;, but that name was misleading. </para>
 
 <para
@@ -228,7 +228,7 @@
 ></blockquote
 > At program termination, a file <filename
 >callgrind.out.pid</filename
-> will be generated which can be loaded into &kcachegrind;. </para>
+> will be generated which can be loaded into &tdecachegrind;. </para>
 
 <para
 >More advanced use is to dump out profile data whenever a given function of your application is called. E.g. for <command
@@ -241,7 +241,7 @@
 > callgrind --dump-before=KonqMainWindow::slotReload konqueror </command
 ></para
 ></blockquote
-> This will produce multiple profile data files with an additional sequential number at the end of the filename. A file without such an number at the end (only ending in the process PID) will also be produced; by loading this file into &kcachegrind;, all others are loaded too, and can be seen in the Parts Overview and Parts list. </para>
+> This will produce multiple profile data files with an additional sequential number at the end of the filename. A file without such an number at the end (only ending in the process PID) will also be produced; by loading this file into &tdecachegrind;, all others are loaded too, and can be seen in the Parts Overview and Parts list. </para>
 
 </sect2>
 
@@ -263,13 +263,13 @@
 >opcontrol -d</command
 >. This will write out the measurement results into files under directory <filename
 >/var/lib/oprofile/samples/</filename
->. To be able to visualise the data in &kcachegrind;, do in an empty directory: <blockquote
+>. To be able to visualise the data in &tdecachegrind;, do in an empty directory: <blockquote
 ><para
 ><command
 > opreport -gdf | op2callgrind </command
 ></para
 ></blockquote
-> This will produce a lot of files, one for every program which was running on the system. Each one can be loaded into &kcachegrind; on its own. </para>
+> This will produce a lot of files, one for every program which was running on the system. Each one can be loaded into &tdecachegrind; on its own. </para>
 
 </sect2>
 </sect1>
@@ -279,7 +279,7 @@
 >User Interface Basics</title>
 
 <para
->When starting &kcachegrind; with a profile data file as argument, or after loading one with File/Open, you will see a sidebar containing the function list at the left; and, on the right the main part, an area with visualisations for a selected function. This visualisation area can be arbitrarily configured to show multiple visualisations at once. </para>
+>When starting &tdecachegrind; with a profile data file as argument, or after loading one with File/Open, you will see a sidebar containing the function list at the left; and, on the right the main part, an area with visualisations for a selected function. This visualisation area can be arbitrarily configured to show multiple visualisations at once. </para>
 
 <para
 >At first start, this area will be divided into a top and a bottom part, each with different visualisations selectable by tabs. To move visualisation views, use the context menu of the tabs, and adjust the splitters between visualisations. To quickly switch between different visualisation layouts, use View/Layouts/Duplicate, change the layout and switch between layouts with View/Layout/Next (or, even better, use the corresponding keyboard shortcuts). </para>
@@ -290,9 +290,9 @@
 > in the left list, and look at the call graph visualisation; there, you see calls happening in your program. Note that the call graph view only shows functions with high event count. By double-clicking a function in the graph, it will change to show the called functions around the selected one. </para>
 
 <para
->To explore the GUI further, in addition to this manual, also have a look at the documentation section on the web site <ulink url="http://kcachegrind.sf.net"
-> http://kcachegrind.sf.net</ulink
->. Also, every widget in &kcachegrind; has <quote
+>To explore the GUI further, in addition to this manual, also have a look at the documentation section on the web site <ulink url="http://tdecachegrind.sf.net"
+> http://tdecachegrind.sf.net</ulink
+>. Also, every widget in &tdecachegrind; has <quote
 >What's this</quote
 > help. </para>
 </sect1>
@@ -300,12 +300,12 @@
 </chapter>
 
 
-<chapter id="kcachegrind-concepts">
+<chapter id="tdecachegrind-concepts">
 <title
 >Basic Concepts</title>
 
 <para
->This chapter explains some concepts of the &kcachegrind;, and introduces terms used in the interface. </para>
+>This chapter explains some concepts of the &tdecachegrind;, and introduces terms used in the interface. </para>
 
 <sect1 id="concepts-model">
 <title
@@ -611,9 +611,9 @@
 <title
 >Command Reference</title>
 
-<sect1 id="kcachegrind-mainwindow">
+<sect1 id="tdecachegrind-mainwindow">
 <title
->The main &kcachegrind; window</title>
+>The main &tdecachegrind; window</title>
 <para
 ></para>
 
@@ -847,11 +847,11 @@
 <qandaentry>
 <question>
 <para
->What is &kcachegrind; for? I have no idea. </para>
+>What is &tdecachegrind; for? I have no idea. </para>
 </question>
 <answer>
 <para
->&kcachegrind; is a helpful at a later stage in software development, called Profiling. If you don't develop applications, you don't need &kcachegrind;. </para>
+>&tdecachegrind; is a helpful at a later stage in software development, called Profiling. If you don't develop applications, you don't need &tdecachegrind;. </para>
 </answer>
 </qandaentry>
 
@@ -974,13 +974,13 @@
 <title
 >Installation</title>
 
-<sect1 id="getting-kcachegrind">
+<sect1 id="getting-tdecachegrind">
 <title
->How to obtain &kcachegrind;</title>
+>How to obtain &tdecachegrind;</title>
 
 <para
->&kcachegrind; is part of the &package; package of &kde;. For less supported interim releases, &callgrind; and further documentation, see the homepage at <ulink url="http://kcachegrind.sf.net"
-> http://kcachegrind.sf.net</ulink
+>&tdecachegrind; is part of the &package; package of &kde;. For less supported interim releases, &callgrind; and further documentation, see the homepage at <ulink url="http://tdecachegrind.sf.net"
+> http://tdecachegrind.sf.net</ulink
 >. Look there for further installation and compile instructions. </para>
 </sect1>
 
@@ -989,7 +989,7 @@
 >Requirements</title>
 
 <para
->In order to successfully use &kcachegrind;, you need &kde; 3.x. For generating profile data, &cachegrind; or &calltree;/&callgrind; is recommend. </para>
+>In order to successfully use &tdecachegrind;, you need &kde; 3.x. For generating profile data, &cachegrind; or &calltree;/&callgrind; is recommend. </para>
 </sect1>
 
 <sect1 id="compilation">
diff --git a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
index 8d4b2f60dcf..7107a744e57 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
@@ -4356,103 +4356,103 @@ msgstr "system error: %1"
 msgid "request was canceled"
 msgstr "request was cancelled"
 
-#: tdecore/network/ksocketbase.cpp:172
+#: tdecore/network/tdesocketbase.cpp:172
 msgid ""
 "_: Socket error code NoError\n"
 "no error"
 msgstr "no error"
 
-#: tdecore/network/ksocketbase.cpp:177
+#: tdecore/network/tdesocketbase.cpp:177
 msgid ""
 "_: Socket error code LookupFailure\n"
 "name lookup has failed"
 msgstr "name lookup has failed"
 
-#: tdecore/network/ksocketbase.cpp:182
+#: tdecore/network/tdesocketbase.cpp:182
 msgid ""
 "_: Socket error code AddressInUse\n"
 "address already in use"
 msgstr "address already in use"
 
-#: tdecore/network/ksocketbase.cpp:187
+#: tdecore/network/tdesocketbase.cpp:187
 msgid ""
 "_: Socket error code AlreadyBound\n"
 "socket is already bound"
 msgstr "socket is already bound"
 
-#: tdecore/network/ksocketbase.cpp:192
+#: tdecore/network/tdesocketbase.cpp:192
 msgid ""
 "_: Socket error code AlreadyCreated\n"
 "socket is already created"
 msgstr "socket is already created"
 
-#: tdecore/network/ksocketbase.cpp:197
+#: tdecore/network/tdesocketbase.cpp:197
 msgid ""
 "_: Socket error code NotBound\n"
 "socket is not bound"
 msgstr "socket is not bound"
 
-#: tdecore/network/ksocketbase.cpp:202
+#: tdecore/network/tdesocketbase.cpp:202
 msgid ""
 "_: Socket error code NotCreated\n"
 "socket has not been created"
 msgstr "socket has not been created"
 
-#: tdecore/network/ksocketbase.cpp:207
+#: tdecore/network/tdesocketbase.cpp:207
 msgid ""
 "_: Socket error code WouldBlock\n"
 "operation would block"
 msgstr "operation would block"
 
-#: tdecore/network/ksocketbase.cpp:212
+#: tdecore/network/tdesocketbase.cpp:212
 msgid ""
 "_: Socket error code ConnectionRefused\n"
 "connection actively refused"
 msgstr "connection actively refused"
 
-#: tdecore/network/ksocketbase.cpp:217
+#: tdecore/network/tdesocketbase.cpp:217
 msgid ""
 "_: Socket error code ConnectionTimedOut\n"
 "connection timed out"
 msgstr "connection timed out"
 
-#: tdecore/network/ksocketbase.cpp:222
+#: tdecore/network/tdesocketbase.cpp:222
 msgid ""
 "_: Socket error code InProgress\n"
 "operation is already in progress"
 msgstr "operation is already in progress"
 
-#: tdecore/network/ksocketbase.cpp:227
+#: tdecore/network/tdesocketbase.cpp:227
 msgid ""
 "_: Socket error code NetFailure\n"
 "network failure occurred"
 msgstr "network failure occurred"
 
-#: tdecore/network/ksocketbase.cpp:232
+#: tdecore/network/tdesocketbase.cpp:232
 msgid ""
 "_: Socket error code NotSupported\n"
 "operation is not supported"
 msgstr "operation is not supported"
 
-#: tdecore/network/ksocketbase.cpp:237
+#: tdecore/network/tdesocketbase.cpp:237
 msgid ""
 "_: Socket error code Timeout\n"
 "timed operation timed out"
 msgstr "timed operation timed out"
 
-#: tdecore/network/ksocketbase.cpp:242
+#: tdecore/network/tdesocketbase.cpp:242
 msgid ""
 "_: Socket error code UnknownError\n"
 "an unknown/unexpected error has happened"
 msgstr "an unknown/unexpected error has happened"
 
-#: tdecore/network/ksocketbase.cpp:247
+#: tdecore/network/tdesocketbase.cpp:247
 msgid ""
 "_: Socket error code RemotelyDisconnected\n"
 "remote host closed connection"
 msgstr "remote host closed connection"
 
-#: tdecore/network/ksocketaddress.cpp:625
+#: tdecore/network/tdesocketaddress.cpp:625
 #, c-format
 msgid ""
 "_: 1: the unknown socket address family number\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/Makefile.in b/tde-i18n-en_GB/messages/tdesdk/Makefile.in
index 41a296862a6..3e26de98798 100644
--- a/tde-i18n-en_GB/messages/tdesdk/Makefile.in
+++ b/tde-i18n-en_GB/messages/tdesdk/Makefile.in
@@ -192,8 +192,8 @@ KDE_LANG = en_GB
 SUBDIRS =.
 #>- POFILES = AUTO
 #>+ 2
-POFILES = kbugbuster.po kfile_po.po kuiviewer.po kfile_ts.po kio_svn.po kcachegrind.po kfile_diff.po kres_bugzilla.po kompare.po cvsservice.po spy.po kstartperf.po cervisia.po kbabel.po umbrello.po kfile_cpp.po
-GMOFILES = kbugbuster.gmo kfile_po.gmo kuiviewer.gmo kfile_ts.gmo kio_svn.gmo kcachegrind.gmo kfile_diff.gmo kres_bugzilla.gmo kompare.gmo cvsservice.gmo spy.gmo kstartperf.gmo cervisia.gmo kbabel.gmo umbrello.gmo kfile_cpp.gmo
+POFILES = kbugbuster.po kfile_po.po kuiviewer.po kfile_ts.po kio_svn.po tdecachegrind.po kfile_diff.po kres_bugzilla.po kompare.po cvsservice.po spy.po kstartperf.po cervisia.po kbabel.po umbrello.po kfile_cpp.po
+GMOFILES = kbugbuster.gmo kfile_po.gmo kuiviewer.gmo kfile_ts.gmo kio_svn.gmo tdecachegrind.gmo kfile_diff.gmo kres_bugzilla.gmo kompare.gmo cvsservice.gmo spy.gmo kstartperf.gmo cervisia.gmo kbabel.gmo umbrello.gmo kfile_cpp.gmo
 #>- all: all-recursive
 #>+ 1
 all: all-nls docs-am  all-recursive
@@ -531,7 +531,7 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=kfile_po.po kbabel.po spy.po kcachegrind.po umbrello.po kres_bugzilla.po kuiviewer.po Makefile.in cvsservice.po kstartperf.po kfile_ts.po kbugbuster.po cervisia.po kio_svn.po kfile_cpp.po kfile_diff.po kompare.po Makefile.am 
+KDE_DIST=kfile_po.po kbabel.po spy.po tdecachegrind.po umbrello.po kres_bugzilla.po kuiviewer.po Makefile.in cvsservice.po kstartperf.po kfile_ts.po kbugbuster.po cervisia.po kio_svn.po kfile_cpp.po kfile_diff.po kompare.po Makefile.am 
 
 #>+ 49
 kbugbuster.gmo: kbugbuster.po
@@ -549,9 +549,9 @@ kfile_ts.gmo: kfile_ts.po
 kio_svn.gmo: kio_svn.po
 	rm -f kio_svn.gmo; $(GMSGFMT) -o kio_svn.gmo $(srcdir)/kio_svn.po
 	test ! -f kio_svn.gmo || touch kio_svn.gmo
-kcachegrind.gmo: kcachegrind.po
-	rm -f kcachegrind.gmo; $(GMSGFMT) -o kcachegrind.gmo $(srcdir)/kcachegrind.po
-	test ! -f kcachegrind.gmo || touch kcachegrind.gmo
+tdecachegrind.gmo: tdecachegrind.po
+	rm -f tdecachegrind.gmo; $(GMSGFMT) -o tdecachegrind.gmo $(srcdir)/tdecachegrind.po
+	test ! -f tdecachegrind.gmo || touch tdecachegrind.gmo
 kfile_diff.gmo: kfile_diff.po
 	rm -f kfile_diff.gmo; $(GMSGFMT) -o kfile_diff.gmo $(srcdir)/kfile_diff.po
 	test ! -f kfile_diff.gmo || touch kfile_diff.gmo
@@ -585,12 +585,12 @@ kfile_cpp.gmo: kfile_cpp.po
 
 #>+ 3
 clean-nls:
-	-rm -f  kbugbuster.gmo kfile_po.gmo kuiviewer.gmo kfile_ts.gmo kio_svn.gmo kcachegrind.gmo kfile_diff.gmo kres_bugzilla.gmo kompare.gmo cvsservice.gmo spy.gmo kstartperf.gmo cervisia.gmo kbabel.gmo umbrello.gmo kfile_cpp.gmo
+	-rm -f  kbugbuster.gmo kfile_po.gmo kuiviewer.gmo kfile_ts.gmo kio_svn.gmo tdecachegrind.gmo kfile_diff.gmo kres_bugzilla.gmo kompare.gmo cvsservice.gmo spy.gmo kstartperf.gmo cervisia.gmo kbabel.gmo umbrello.gmo kfile_cpp.gmo
 
 #>+ 10
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
-	@for base in kbugbuster kfile_po kuiviewer kfile_ts kio_svn kcachegrind kfile_diff kres_bugzilla kompare cvsservice spy kstartperf cervisia kbabel umbrello kfile_cpp ; do \
+	@for base in kbugbuster kfile_po kuiviewer kfile_ts kio_svn tdecachegrind kfile_diff kres_bugzilla kompare cvsservice spy kstartperf cervisia kbabel umbrello kfile_cpp ; do \
 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
@@ -605,7 +605,7 @@ uninstall-nls:
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kuiviewer.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfile_ts.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_svn.mo
-	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcachegrind.mo
+	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/tdecachegrind.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kfile_diff.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kres_bugzilla.mo
 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kompare.mo
diff --git a/tde-i18n-en_GB/messages/tdesdk/kcachegrind.po b/tde-i18n-en_GB/messages/tdesdk/kcachegrind.po
index a4faacf0ac5..e9b2c48ae12 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kcachegrind.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kcachegrind.po
@@ -1,4 +1,4 @@
-# translation of kcachegrind.po to British English
+# translation of tdecachegrind.po to British English
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Malcolm Hunter <malcolm.hunter@gmx.co.uk>, 2003, 2004, 2005.
 # Jonathan Riddell <kde-en-gb@jriddell.org>, 2003.
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kcachegrind\n"
+"Project-Id-Version: tdecachegrind\n"
 "POT-Creation-Date: 2008-07-08 01:21+0200\n"
 "PO-Revision-Date: 2005-12-30 14:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
@@ -1803,19 +1803,19 @@ msgstr "L2 Miss Sum"
 msgid "Cycle Estimation"
 msgstr "Cycle Estimation"
 
-#. i18n: file kcachegrindui.rc line 15
+#. i18n: file tdecachegrindui.rc line 15
 #: rc.cpp:9
 #, no-c-format
 msgid "&Layout"
 msgstr "&Layout"
 
-#. i18n: file kcachegrindui.rc line 32
+#. i18n: file tdecachegrindui.rc line 32
 #: rc.cpp:12
 #, no-c-format
 msgid "Sidebars"
 msgstr "Sidebars"
 
-#. i18n: file kcachegrindui.rc line 54
+#. i18n: file tdecachegrindui.rc line 54
 #: rc.cpp:18
 #, no-c-format
 msgid "State Toolbar"
diff --git a/tde-i18n-en_GB/messages/tdevelop/tdevelop.po b/tde-i18n-en_GB/messages/tdevelop/tdevelop.po
index 0812439b1e9..689b6bf5f15 100644
--- a/tde-i18n-en_GB/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-en_GB/messages/tdevelop/tdevelop.po
@@ -24828,10 +24828,10 @@ msgstr "Valgrind Not Found"
 
 #: parts/valgrind/valgrind_dialog.cpp:185
 msgid ""
-"Could not find kcachegrind in your $PATH. Please make sure it is installed "
+"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
 "properly."
 msgstr ""
-"Could not find kcachegrind in your $PATH. Please make sure it is installed "
+"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
 "properly."
 
 #: parts/valgrind/valgrind_dialog.cpp:187